You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2009/04/13 15:28:09 UTC
svn commit: r764449 [1/2] - in /incubator/jspwiki/trunk: ./
src/java/org/apache/wiki/ src/java/org/apache/wiki/action/
src/java/org/apache/wiki/api/ src/java/org/apache/wiki/attachment/
src/java/org/apache/wiki/content/ src/java/org/apache/wiki/parser/...
Author: jalkanen
Date: Mon Apr 13 13:28:07 2009
New Revision: 764449
URL: http://svn.apache.org/viewvc?rev=764449&view=rev
Log:
At Andrew's suggestion, WikiName is now called WikiPath. Also changed
relevant methods in WikiPage.
Added:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPath.java
- copied, changed from r764439, incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java
Removed:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/EnglishPluralsPageNameResolver.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageAlreadyExistsException.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNameResolver.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNotFoundException.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/SpecialPageNameResolver.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.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/render/RenderingManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/EnglishPluralsPageNameResolverTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Apr 13 13:28:07 2009
@@ -1,3 +1,10 @@
+2009-04-13 Janne Jalkanen <ja...@apache.org>
+
+ * 3.0.0-svn-101
+
+ * At Andrew's suggestion, WikiName is now called WikiPath. Also changed
+ relevant methods in WikiPage.
+
2009-04-12 Janne Jalkanen <ja...@apache.org>
* 3.0.0-svn-100
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java Mon Apr 13 13:28:07 2009
@@ -33,7 +33,7 @@
import org.apache.wiki.auth.acl.Acl;
import org.apache.wiki.content.ContentManager;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.providers.ProviderException;
@@ -67,15 +67,15 @@
public static final String REFERSTO = "wiki:refersTo";
- private WikiName m_name;
+ private WikiPath m_name;
private WikiEngine m_engine;
private String m_jcrPath = null;
/**
- * Use {@link WikiEngine#createPage(WikiName)} instead.
+ * Use {@link WikiEngine#createPage(WikiPath)} instead.
* @deprecated
*/
- public JCRWikiPage( WikiEngine engine, WikiName name )
+ public JCRWikiPage( WikiEngine engine, WikiPath name )
{
m_engine = engine;
m_name = name;
@@ -106,7 +106,7 @@
/* (non-Javadoc)
* @see org.apache.wiki.WikiPage#getQualifiedName()
*/
- public WikiName getQualifiedName()
+ public WikiPath getWikiPath()
{
return m_name;
}
@@ -476,9 +476,9 @@
return null;
}
- public Collection<WikiName> getRefersTo() throws ProviderException
+ public Collection<WikiPath> getRefersTo() throws ProviderException
{
- Collection<WikiName> refs = new ArrayList<WikiName>();
+ Collection<WikiPath> refs = new ArrayList<WikiPath>();
try
{
@@ -487,7 +487,7 @@
Value[] values = p.getValues();
for( Value v : values )
- refs.add( WikiName.valueOf( v.getString() ) );
+ refs.add( WikiPath.valueOf( v.getString() ) );
}
catch( PathNotFoundException e ) {}
catch( RepositoryException e )
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java Mon Apr 13 13:28:07 2009
@@ -29,7 +29,7 @@
import org.apache.wiki.content.ContentManager;
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.content.lock.PageLock;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
@@ -148,7 +148,7 @@
public String getPageText( String pageName, int version )
throws PageNotFoundException, ProviderException
{
- WikiPage p = m_engine.getContentManager().getPage( WikiName.valueOf( pageName ), version );
+ WikiPage p = m_engine.getContentManager().getPage( WikiPath.valueOf( pageName ), version );
if( p != null ) return p.getContentAsString();
@@ -179,13 +179,13 @@
WikiPage p;
try
{
- p = m_engine.getContentManager().getPage( page.getQualifiedName() );
+ p = m_engine.getContentManager().getPage( page.getWikiPath() );
}
catch( PageNotFoundException e )
{
try
{
- p = m_engine.getContentManager().addPage( page.getQualifiedName(), ContentManager.JSPWIKI_CONTENT_TYPE );
+ p = m_engine.getContentManager().addPage( page.getWikiPath(), ContentManager.JSPWIKI_CONTENT_TYPE );
}
catch( PageAlreadyExistsException e1 )
{
@@ -260,7 +260,7 @@
public WikiPage getPageInfo( String pageName, int version )
throws PageNotFoundException, ProviderException
{
- return m_engine.getContentManager().getPage( WikiName.valueOf( pageName ), version );
+ return m_engine.getContentManager().getPage( WikiPath.valueOf( pageName ), version );
}
/**
@@ -276,7 +276,7 @@
public List getVersionHistory( String pageName )
throws PageNotFoundException, ProviderException
{
- return m_engine.getContentManager().getVersionHistory( WikiName.valueOf( pageName ) );
+ return m_engine.getContentManager().getVersionHistory( WikiPath.valueOf( pageName ) );
}
/**
@@ -319,7 +319,7 @@
public boolean pageExists( String pageName )
throws ProviderException
{
- return m_engine.getContentManager().pageExists( WikiName.valueOf( pageName ) );
+ return m_engine.getContentManager().pageExists( WikiPath.valueOf( pageName ) );
}
/**
@@ -334,7 +334,7 @@
public boolean pageExists( String pageName, int version )
throws ProviderException
{
- return m_engine.getContentManager().pageExists( WikiName.valueOf( pageName ), version );
+ return m_engine.getContentManager().pageExists( WikiPath.valueOf( pageName ), version );
}
/**
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=764449&r1=764448&r2=764449&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 13 13:28:07 2009
@@ -31,7 +31,7 @@
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.ContentManager;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.event.WikiEvent;
import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WikiEventUtils;
@@ -246,18 +246,18 @@
* @throws PageNotFoundException
* @throws ProviderException
*/
- public synchronized void pageRemoved( WikiName pageName ) throws ProviderException, PageNotFoundException
+ public synchronized void pageRemoved( WikiPath pageName ) throws ProviderException, PageNotFoundException
{
WikiPage page = m_engine.getContentManager().getPage( pageName );
- Collection<WikiName> refTo = page.getRefersTo();
+ Collection<WikiPath> refTo = page.getRefersTo();
- for( WikiName referred : refTo )
+ for( WikiPath referred : refTo )
{
- log.debug( "Removing references to page %s from page %s", page.getQualifiedName(), referred );
- Set<WikiName> referredBy = findReferrers(referred);
+ log.debug( "Removing references to page %s from page %s", page.getWikiPath(), referred );
+ Set<WikiPath> referredBy = findReferrers(referred);
- referredBy.remove( page.getQualifiedName() );
+ referredBy.remove( page.getWikiPath() );
try
{
@@ -274,7 +274,7 @@
/**
* Build the path which is used to store the ReferredBy data
*/
- private final String getReferredByJCRPath(WikiName name)
+ private final String getReferredByJCRPath(WikiPath name)
{
return "/wiki:references/"+name.getSpace()+"/"+name.getPath();
}
@@ -288,7 +288,7 @@
* @throws ProviderException If something goes wrong.
* @since 3.0
*/
- public Set<WikiName> findReferrers(WikiName name) throws ProviderException
+ public Set<WikiPath> findReferrers(WikiPath name) throws ProviderException
{
String jcrPath = getReferredByJCRPath( name );
@@ -298,11 +298,11 @@
Property p = (Property)m_engine.getContentManager().getCurrentSession().getItem(jcrPath);
- TreeSet<WikiName> result = new TreeSet<WikiName>();
+ TreeSet<WikiPath> result = new TreeSet<WikiPath>();
for( Value v : p.getValues() )
{
- result.add( WikiName.valueOf( v.getString() ) );
+ result.add( WikiPath.valueOf( v.getString() ) );
}
return result;
@@ -310,7 +310,7 @@
catch( PathNotFoundException e )
{
// Fine, we can return an empty set
- return new TreeSet<WikiName>();
+ return new TreeSet<WikiPath>();
}
catch( RepositoryException e )
{
@@ -325,13 +325,13 @@
* @param references
* @throws RepositoryException
*/
- private void setReferredBy(WikiName name,Set<WikiName> references) throws RepositoryException
+ private void setReferredBy(WikiPath name,Set<WikiPath> references) throws RepositoryException
{
String jcrPath = getReferredByJCRPath( name );
Property p = null;
String[] value = new String[references.size()];
- WikiName[] refs = references.toArray(new WikiName[references.size()]);
+ WikiPath[] refs = references.toArray(new WikiPath[references.size()]);
for( int i = 0; i < references.size(); i++ )
{
@@ -374,7 +374,7 @@
* @param page Name of the page to update.
* @param references A Collection of Strings, each one pointing to a page this page references.
*/
- public synchronized void updateReferences( WikiPage page, Collection<WikiName> references )
+ public synchronized void updateReferences( WikiPage page, Collection<WikiPath> references )
throws ProviderException
{
try
@@ -400,19 +400,19 @@
* @throws RepositoryException
*/
- private void internalUpdateReferences(JCRWikiPage page, Collection<WikiName> newRefersTo) throws ProviderException, RepositoryException
+ private void internalUpdateReferences(JCRWikiPage page, Collection<WikiPath> newRefersTo) throws ProviderException, RepositoryException
{
//
// Get the old refererences so that we can go and ping every page on that
// list and make sure that their referredBy lists are fine.
//
- Collection<WikiName> oldRefersTo = page.getRefersTo();
+ Collection<WikiPath> oldRefersTo = page.getRefersTo();
//
// Set up the new references list
//
- WikiName[] wn = newRefersTo.toArray(new WikiName[newRefersTo.size()]);
+ WikiPath[] wn = newRefersTo.toArray(new WikiPath[newRefersTo.size()]);
String[] nr = new String[newRefersTo.size()];
for( int i = 0; i < nr.length; i++ )
@@ -428,26 +428,26 @@
// Go ping the old pages that the reference list has changed.
//
- for( WikiName name : oldRefersTo )
+ for( WikiPath name : oldRefersTo )
{
if( !newRefersTo.contains( name ) )
{
// A page is no longer referenced, so this page is removed from its
// referencedBy list.
- Set<WikiName> refs = findReferrers( name );
- refs.remove( page.getQualifiedName() );
+ Set<WikiPath> refs = findReferrers( name );
+ refs.remove( page.getWikiPath() );
setReferredBy( name, refs );
}
}
- for( WikiName name : newRefersTo )
+ for( WikiPath name : newRefersTo )
{
if( !oldRefersTo.contains(name) )
{
// There is a new reference which is not in the old references list,
// so we will need to add it to the new page's referencedBy list.
- Set<WikiName> refs = findReferrers( name );
- refs.add( page.getQualifiedName() );
+ Set<WikiPath> refs = findReferrers( name );
+ refs.add( page.getWikiPath() );
setReferredBy( name, refs );
}
}
@@ -547,9 +547,9 @@
{
ArrayList<String> result = new ArrayList<String>();
- Collection<WikiName> refs = m_engine.getPage( pageName ).getRefersTo();
+ Collection<WikiPath> refs = m_engine.getPage( pageName ).getRefersTo();
- for( WikiName wn : refs )
+ for( WikiPath wn : refs )
result.add( wn.toString() );
return result;
@@ -574,7 +574,7 @@
Collection<WikiPage> c = m_engine.getContentManager().getAllPages( null );
for( WikiPage p : c )
- result.add( p.getQualifiedName().toString() );
+ result.add( p.getWikiPath().toString() );
return result;
}
@@ -592,7 +592,7 @@
{
try
{
- pageRemoved( WikiName.valueOf(pageName) );
+ pageRemoved( WikiPath.valueOf(pageName) );
}
catch( ProviderException e )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Mon Apr 13 13:28:07 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "100";
+ public static final String BUILD = "101";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Mon Apr 13 13:28:07 2009
@@ -914,7 +914,7 @@
{
try
{
- return getFrontPage(null).getQualifiedName().toString();
+ return getFrontPage(null).getWikiPath().toString();
}
catch( ProviderException e )
{
@@ -935,7 +935,7 @@
public WikiPage getFrontPage( String space ) throws ProviderException
{
WikiPage p;
- WikiName name = new WikiName( space, m_frontPage );
+ WikiPath name = new WikiPath( space, m_frontPage );
try
{
@@ -1221,7 +1221,7 @@
{
WikiPage att = null;
- WikiName name = WikiName.valueOf(page);
+ WikiPath name = WikiPath.valueOf(page);
try
{
if( getFinalPageName( name ) != null )
@@ -1250,7 +1250,7 @@
throws ProviderException
{
boolean isThere = false;
- WikiName finalName = WikiName.valueOf( page );
+ WikiPath finalName = WikiPath.valueOf( page );
try
{
// Go and check if this particular version of this page exists
@@ -1439,7 +1439,7 @@
try
{
- WikiPage p = m_contentManager.getPage( WikiName.valueOf( page ), version );
+ WikiPage p = m_contentManager.getPage( WikiPath.valueOf( page ), version );
result = p.getContentAsString();
}
catch( PageNotFoundException e )
@@ -1589,7 +1589,7 @@
* @param pagedata The page contents
* @return a Collection of Strings
*/
- public List<WikiName> scanWikiLinks( WikiPage page, String pagedata )
+ public List<WikiPath> scanWikiLinks( WikiPage page, String pagedata )
{
LinkCollector localCollector = new LinkCollector();
@@ -1601,11 +1601,11 @@
false,
true );
- ArrayList<WikiName> response = new ArrayList<WikiName>();
+ ArrayList<WikiPath> response = new ArrayList<WikiPath>();
for( String s : localCollector.getLinks() )
{
- response.add( WikiName.valueOf( s ) );
+ response.add( WikiPath.valueOf( s ) );
}
return response;
@@ -1919,7 +1919,7 @@
* @throws ProviderException if the backend fails
* @since 3.0
*/
- public WikiPage createPage( WikiName name ) throws PageAlreadyExistsException, ProviderException
+ public WikiPage createPage( WikiPath name ) throws PageAlreadyExistsException, ProviderException
{
return m_contentManager.addPage( name, ContentManager.JSPWIKI_CONTENT_TYPE );
}
@@ -1935,7 +1935,7 @@
*/
public WikiPage createPage( String fqn ) throws PageAlreadyExistsException, ProviderException
{
- return createPage( WikiName.valueOf( fqn ) );
+ return createPage( WikiPath.valueOf( fqn ) );
}
/**
@@ -1950,10 +1950,10 @@
public WikiPage getPage( String pagereq )
throws PageNotFoundException, ProviderException
{
- return getPage( WikiName.valueOf( pagereq ) );
+ return getPage( WikiPath.valueOf( pagereq ) );
}
- public WikiPage getPage( WikiName name )
+ public WikiPage getPage( WikiPath name )
throws PageNotFoundException, ProviderException
{
return m_contentManager.getPage( name );
@@ -1976,7 +1976,7 @@
public WikiPage getPage( String pagereq, int version )
throws PageNotFoundException, ProviderException
{
- WikiPage p = m_contentManager.getPage( WikiName.valueOf( pagereq ), version );
+ WikiPage p = m_contentManager.getPage( WikiPath.valueOf( pagereq ), version );
return p;
}
@@ -1996,7 +1996,7 @@
public List<WikiPage> getVersionHistory( String page )
throws PageNotFoundException, ProviderException
{
- return m_contentManager.getVersionHistory( WikiName.valueOf( page ) );
+ return m_contentManager.getVersionHistory( WikiPath.valueOf( page ) );
}
/**
@@ -2564,7 +2564,7 @@
* @return The rewritten page name. May also return null in case there
* were problems.
*/
- public final WikiName getFinalPageName( WikiName page ) throws ProviderException
+ public final WikiPath getFinalPageName( WikiPath page ) throws ProviderException
{
for( PageNameResolver resolver : m_nameResolvers )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java Mon Apr 13 13:28:07 2009
@@ -42,7 +42,7 @@
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.auth.permissions.PagePermission;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
@@ -193,7 +193,7 @@
if( att == null )
{
String contentType = "application/octet-stream"; // FIXME: This is not a good guess
- WikiName path = context.getPage().getQualifiedName().resolve(filename);
+ WikiPath path = context.getPage().getWikiPath().resolve(filename);
att = engine.getContentManager().addPage( path, contentType );
created = true;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java Mon Apr 13 13:28:07 2009
@@ -47,7 +47,7 @@
import org.apache.wiki.auth.SessionMonitor;
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.parser.MarkupParser;
@@ -388,7 +388,7 @@
// Extract and set the WikiPage
if( page == null )
{
- WikiName pageName = extractPageFromParameter( request );
+ WikiPath pageName = extractPageFromParameter( request );
// For view action, default to front page
if( pageName == null && WikiContext.VIEW.equals( requestContext ) )
@@ -437,7 +437,7 @@
* @param request the HTTP request
* @return the resolved page name
*/
- protected final WikiName extractPageFromParameter( HttpServletRequest request )
+ protected final WikiPath extractPageFromParameter( HttpServletRequest request )
{
// Corner case when request == null
if( request == null )
@@ -447,14 +447,14 @@
// Extract the page name from the URL directly
String[] pages = request.getParameterValues( "page" );
- WikiName page = null;
+ WikiPath page = null;
if( pages != null && pages.length > 0 )
{
- page = WikiName.valueOf(pages[0]);
+ page = WikiPath.valueOf(pages[0]);
try
{
// Look for variants
- WikiName finalPage = m_engine.getFinalPageName( page );
+ WikiPath finalPage = m_engine.getFinalPageName( page );
// If no variant, use whatever the user supplied.
if( finalPage == null ) return page;
@@ -482,7 +482,7 @@
* exist
* @return the wiki page
*/
- protected final WikiPage resolvePage( HttpServletRequest request, WikiName page ) throws PageNotFoundException, ProviderException
+ protected final WikiPage resolvePage( HttpServletRequest request, WikiPath page ) throws PageNotFoundException, ProviderException
{
// See if the user included a version parameter
int version = WikiProvider.LATEST_VERSION;
@@ -502,7 +502,7 @@
String pageName = MarkupParser.cleanLink( page.getPath() );
try
{
- return m_engine.createPage( WikiName.valueOf( pageName ) );
+ return m_engine.createPage( WikiPath.valueOf( pageName ) );
}
catch( PageAlreadyExistsException e1 )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java Mon Apr 13 13:28:07 2009
@@ -29,7 +29,7 @@
import org.apache.wiki.auth.acl.Acl;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.providers.ProviderException;
@@ -67,7 +67,7 @@
*
* @return the qualified page name, for example <code>mywiki:Main</code>
*/
- public WikiName getQualifiedName();
+ public WikiPath getWikiPath();
/**
* A WikiPage may have a number of attributes, which might or might not be
@@ -241,7 +241,7 @@
* page refers to no other pages.
* @throws ProviderException If the references cannot be fetched.
*/
- public Collection<WikiName> getRefersTo() throws ProviderException;
+ public Collection<WikiPath> getRefersTo() throws ProviderException;
/**
* Returns the parent of the page.
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java Mon Apr 13 13:28:07 2009
@@ -37,7 +37,7 @@
import org.apache.wiki.api.WikiException;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.providers.ProviderException;
@@ -130,7 +130,7 @@
public Attachment getAttachmentInfo( String name )
throws ProviderException, PageNotFoundException
{
- return m_engine.getContentManager().getPage( WikiName.valueOf( name ) );
+ return m_engine.getContentManager().getPage( WikiPath.valueOf( name ) );
}
/**
@@ -201,7 +201,7 @@
return null;
}
- WikiName name = currentPage.getQualifiedName().resolve( attachmentname );
+ WikiPath name = currentPage.getWikiPath().resolve( attachmentname );
Attachment att;
@@ -320,7 +320,7 @@
* @see #getAttachmentInfo(String)
*/
- public DynamicAttachment getDynamicAttachment( WikiName name )
+ public DynamicAttachment getDynamicAttachment( WikiPath name )
{
try
{
@@ -397,7 +397,7 @@
public List<WikiPage> getVersionHistory( String attachmentName )
throws ProviderException, PageNotFoundException
{
- return m_engine.getContentManager().getVersionHistory( WikiName.valueOf(attachmentName) );
+ return m_engine.getContentManager().getVersionHistory( WikiPath.valueOf(attachmentName) );
}
/**
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java Mon Apr 13 13:28:07 2009
@@ -50,7 +50,7 @@
import org.apache.wiki.auth.permissions.PermissionFactory;
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.filters.RedirectException;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.log.Logger;
@@ -731,7 +731,7 @@
catch( PageNotFoundException e )
{
String contentType = "application/octet-stream"; // FIXME: This is not a good guess
- WikiName path = context.getPage().getQualifiedName().resolve(filename);
+ WikiPath path = context.getPage().getWikiPath().resolve(filename);
try
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java Mon Apr 13 13:28:07 2009
@@ -22,7 +22,7 @@
import org.apache.wiki.JCRWikiPage;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
/**
* A DynamicAttachment is an attachment which does not really exist, but is
@@ -90,7 +90,7 @@
String fileName,
DynamicAttachmentProvider provider)
{
- super(engine, WikiName.valueOf( parentPage ).resolve( fileName ) );
+ super(engine, WikiPath.valueOf( parentPage ).resolve( fileName ) );
m_provider = provider;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java Mon Apr 13 13:28:07 2009
@@ -666,7 +666,7 @@
* @throws PageNotFoundException If the page does not exist.
*/
- public List<WikiPage> getVersionHistory( WikiName path )
+ public List<WikiPage> getVersionHistory( WikiPath path )
throws ProviderException, PageNotFoundException
{
List<WikiPage> result = new ArrayList<WikiPage>();
@@ -742,11 +742,11 @@
/**
* Returns true, if the page exists (any version).
*
- * @param wikiPath the {@link WikiName} to check for
+ * @param wikiPath the {@link WikiPath} to check for
* @return A boolean value describing the existence of a page
* @throws ProviderException If the backend fails or the wikiPath is illegal.
*/
- public boolean pageExists( WikiName wikiPath )
+ public boolean pageExists( WikiPath wikiPath )
throws ProviderException
{
if( wikiPath == null )
@@ -772,12 +772,12 @@
* Checks for existence of a specific page and version.
*
* @since 2.3.29
- * @param wikiPath the {@link WikiName} to check for
+ * @param wikiPath the {@link WikiPath} to check for
* @param version The version to check
* @return <code>true</code> if the page exists, <code>false</code> otherwise
* @throws ProviderException If the backend fails or the wikiPath is illegal.
*/
- public boolean pageExists( WikiName wikiPath, int version )
+ public boolean pageExists( WikiPath wikiPath, int version )
throws ProviderException
{
if( wikiPath == null )
@@ -1002,7 +1002,7 @@
workflow.setAttribute( PRESAVE_PAGE_AUTHOR, author );
workflow.setAttribute( PRESAVE_PAGE_ATTRIBUTES, (Serializable)page.getAttributes() );
workflow.setAttribute( PRESAVE_PAGE_LASTMODIFIED, new Date() );
- workflow.setAttribute( PRESAVE_PAGE_NAME, page.getQualifiedName() );
+ workflow.setAttribute( PRESAVE_PAGE_NAME, page.getWikiPath() );
workflow.setAttribute( PRESAVE_PAGE_TEXT, saveText );
return Outcome.STEP_COMPLETE;
@@ -1036,7 +1036,7 @@
// Fetch the page that was being saved
Workflow workflow = getWorkflow();
WikiEngine engine = workflow.getWorkflowManager().getEngine();
- WikiName name = (WikiName)workflow.getAttribute( PRESAVE_PAGE_NAME );
+ WikiPath name = (WikiPath)workflow.getAttribute( PRESAVE_PAGE_NAME );
JCRWikiPage page;
try
{
@@ -1109,7 +1109,7 @@
* @param wikiName The WikiName.
* @return A full JCR path
*/
- public static String getJCRPath( WikiName wikiName )
+ public static String getJCRPath( WikiPath wikiName )
{
String spaceName;
String spacePath;
@@ -1123,12 +1123,12 @@
/**
* Evaluates a WikiName in the context of the current page request.
*
- * @param jcrpath The JCR Path used to get the {@link WikiName}
- * @return The {@link WikiName} for the requested jcr path
+ * @param jcrpath The JCR Path used to get the {@link WikiPath}
+ * @return The {@link WikiPath} for the requested jcr path
* @throws ProviderException If the backend fails.
*/
// FIXME: Should be protected - fix once WikiPage moves to content-package
- public static WikiName getWikiPath( String jcrpath ) throws ProviderException
+ public static WikiPath getWikiPath( String jcrpath ) throws ProviderException
{
if( jcrpath.startsWith("/"+JCR_PAGES_NODE+"/") )
{
@@ -1138,7 +1138,7 @@
if( firstSlash != -1 )
{
- return new WikiName(wikiPath.substring( 0, firstSlash ),
+ return new WikiPath(wikiPath.substring( 0, firstSlash ),
wikiPath.substring( firstSlash+1 ) );
}
}
@@ -1156,7 +1156,7 @@
* @throws PageAlreadyExistsException if the page already exists in the repository
* @throws ProviderException if the backend fails
*/
- public JCRWikiPage addPage( WikiName path, String contentType ) throws PageAlreadyExistsException, ProviderException
+ public JCRWikiPage addPage( WikiPath path, String contentType ) throws PageAlreadyExistsException, ProviderException
{
try
{
@@ -1186,7 +1186,7 @@
* @throws PageNotFoundException If the page does not exist, or if <code>path</code>
* is <code>null</code>
*/
- public JCRWikiPage getPage( WikiName path ) throws ProviderException, PageNotFoundException
+ public JCRWikiPage getPage( WikiPath path ) throws ProviderException, PageNotFoundException
{
if ( path == null )
{
@@ -1224,7 +1224,7 @@
* @throws ProviderException If the backend fails.
* @throws PageNotFoundException If the page version in question cannot be found.
*/
- public JCRWikiPage getPage( WikiName path, int version ) throws ProviderException, PageNotFoundException
+ public JCRWikiPage getPage( WikiPath path, int version ) throws ProviderException, PageNotFoundException
{
try
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/EnglishPluralsPageNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/EnglishPluralsPageNameResolver.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/EnglishPluralsPageNameResolver.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/EnglishPluralsPageNameResolver.java Mon Apr 13 13:28:07 2009
@@ -46,7 +46,7 @@
}
@Override
- public WikiName resolve( WikiName name ) throws ProviderException
+ public WikiPath resolve( WikiPath name ) throws ProviderException
{
ContentManager mgr = m_engine.getContentManager();
@@ -54,16 +54,16 @@
if( m_matchEnglishPlurals )
{
- WikiName alternativeName;
+ WikiPath alternativeName;
if( name.getPath().endsWith( "s" ) )
{
- alternativeName = new WikiName( name.getSpace(),
+ alternativeName = new WikiPath( name.getSpace(),
name.getPath().substring( 0, name.getPath().length()-1) );
}
else
{
- alternativeName = new WikiName( name.getSpace(),
+ alternativeName = new WikiPath( name.getSpace(),
name.getPath()+"s" );
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageAlreadyExistsException.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageAlreadyExistsException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageAlreadyExistsException.java Mon Apr 13 13:28:07 2009
@@ -43,7 +43,7 @@
* Construct an exception from a WikiName path.
* @param path the path to the WikiPage, which already exists.
*/
- public PageAlreadyExistsException( WikiName path )
+ public PageAlreadyExistsException( WikiPath path )
{
super( path.toString() );
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNameResolver.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNameResolver.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNameResolver.java Mon Apr 13 13:28:07 2009
@@ -50,5 +50,5 @@
* @return A new name that you should getPage() on.
* @throws ProviderException If the resolution fails in any way.
*/
- public abstract WikiName resolve( WikiName name ) throws ProviderException;
+ public abstract WikiPath resolve( WikiPath name ) throws ProviderException;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNotFoundException.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNotFoundException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageNotFoundException.java Mon Apr 13 13:28:07 2009
@@ -45,7 +45,7 @@
* Construct an exception from a WikiName path.
* @param path The path to the nonexistant WikiPage.
*/
- public PageNotFoundException( WikiName path )
+ public PageNotFoundException( WikiPath path )
{
super( path.toString() );
}
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=764449&r1=764448&r2=764449&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 13 13:28:07 2009
@@ -129,7 +129,7 @@
JSPWikiMarkupParser.PROP_CAMELCASELINKS,
m_camelCase );
- Set<WikiName> referrers = getReferencesToChange( fromPage, engine );
+ Set<WikiPath> referrers = getReferencesToChange( fromPage, engine );
//
// Do the actual rename by changing from the frompage to the topage, including
@@ -168,7 +168,7 @@
try
{
- engine.getReferenceManager().pageRemoved( fromPage.getQualifiedName() );
+ engine.getReferenceManager().pageRemoved( fromPage.getWikiPath() );
}
catch( PageNotFoundException e )
{
@@ -204,19 +204,19 @@
* @param fromPage The old page
* @param toPage The new page
*/
- private void updateReferrers( WikiContext context, WikiPage fromPage, WikiPage toPage, Set<WikiName>referrers )
+ private void updateReferrers( WikiContext context, WikiPage fromPage, WikiPage toPage, Set<WikiPath>referrers )
{
WikiEngine engine = context.getEngine();
if( referrers.isEmpty() ) return; // No referrers
- for( WikiName pageName : referrers )
+ for( WikiPath pageName : referrers )
{
// In case the page was just changed from under us, let's do this
// small kludge.
- if( pageName.equals( fromPage.getQualifiedName() ) )
+ if( pageName.equals( fromPage.getWikiPath() ) )
{
- pageName = toPage.getQualifiedName();
+ pageName = toPage.getWikiPath();
}
try
@@ -255,13 +255,13 @@
}
@SuppressWarnings("unchecked")
- private Set<WikiName> getReferencesToChange( WikiPage fromPage, WikiEngine engine )
+ private Set<WikiPath> getReferencesToChange( WikiPage fromPage, WikiEngine engine )
{
- Set<WikiName> referrers = new TreeSet<WikiName>();
+ Set<WikiPath> referrers = new TreeSet<WikiPath>();
try
{
- Collection<WikiName> r = engine.getReferenceManager().findReferrers( fromPage.getQualifiedName() );
+ Collection<WikiPath> r = engine.getReferenceManager().findReferrers( fromPage.getWikiPath() );
if( r != null ) referrers.addAll( r );
/*
Collection<Attachment> attachments = engine.getAttachmentManager().listAttachments( fromPage );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/SpecialPageNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/SpecialPageNameResolver.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/SpecialPageNameResolver.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/SpecialPageNameResolver.java Mon Apr 13 13:28:07 2009
@@ -60,7 +60,7 @@
}
@Override
- public WikiName resolve( WikiName name ) throws ProviderException
+ public WikiPath resolve( WikiPath name ) throws ProviderException
{
if( simplePageExists(name) ) return name;
@@ -76,7 +76,7 @@
* @return <code>true</code> if the page exists, <code>false</code>
* otherwise
*/
- protected final boolean simplePageExists( WikiName page ) throws ProviderException
+ protected final boolean simplePageExists( WikiPath page ) throws ProviderException
{
if( m_specialRedirects.containsKey( page ) )
{
Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPath.java (from r764439, incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPath.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPath.java&p1=incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java&r1=764439&r2=764449&rev=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPath.java Mon Apr 13 13:28:07 2009
@@ -23,23 +23,23 @@
import java.io.Serializable;
/**
- * A WikiName represents a combination of a WikiSpace as well as a
+ * A WikiPath represents a combination of a WikiSpace as well as a
* path within that space. For example, in "MyWiki:MainPage/foo.jpg",
* "MyWiki" is the space, and "MainPage/foo.jpg" is the path within that space.
* <p>
- * A WikiName is a static object which cannot be changed after it has been
+ * A WikiPath is an immutable object which cannot be changed after it has been
* created.
*
* @since 3.0
*/
-public class WikiName implements Serializable, Comparable<WikiName>
+public class WikiPath implements Serializable, Comparable<WikiPath>
{
private static final long serialVersionUID = 1L;
private String m_space;
private String m_path;
private String m_stringRepresentation = null;
- private WikiName()
+ private WikiPath()
{}
/**
@@ -48,7 +48,7 @@
* @param space The space. If space == null, then uses {@link ContentManager#DEFAULT_SPACE}
* @param path The path
*/
- public WikiName(String space, String path)
+ public WikiPath(String space, String path)
{
m_space = (space != null) ? space : ContentManager.DEFAULT_SPACE;
m_path = path;
@@ -63,11 +63,13 @@
* @return A WikiName
* @throws IllegalArgumentException If the path is null.
*/
- public static WikiName valueOf(String path) throws IllegalArgumentException
+ // TODO: Measure performance in realtime situations, then figure out whether
+ // we should have an internal HashMap for path objects.
+ public static WikiPath valueOf(String path) throws IllegalArgumentException
{
if( path == null ) throw new IllegalArgumentException("null path given to WikiName.valueOf().");
- WikiName name = new WikiName();
+ WikiPath name = new WikiPath();
int colon = path.indexOf(':');
if( colon != -1 )
@@ -111,13 +113,13 @@
* @return A Valid WikiName or null, if there is no parent.
*/
// FIXME: Would it make more sense to throw an exception?
- public WikiName getParent()
+ public WikiPath getParent()
{
int slash = m_path.lastIndexOf( '/' );
if( slash == -1 ) return null;
- return new WikiName( m_space, m_path.substring( 0, slash ) );
+ return new WikiPath( m_space, m_path.substring( 0, slash ) );
}
/**
@@ -127,17 +129,17 @@
* @param path Path to resolve
* @return A new WikiName
*/
- public WikiName resolve( String path )
+ public WikiPath resolve( String path )
{
int colon = path.indexOf( ':' );
if( colon != -1 )
{
// It is a FQN, essentially an absolute path, so no resolution necessary
- return WikiName.valueOf( path );
+ return WikiPath.valueOf( path );
}
- return new WikiName( getSpace(), path );
+ return new WikiPath( getSpace(), path );
}
/**
@@ -175,7 +177,7 @@
* @param o The Object to compare against.
* @return int
*/
- public int compareTo( WikiName o )
+ public int compareTo( WikiPath o )
{
return toString().compareTo( o.toString() );
}
@@ -191,9 +193,9 @@
*/
public boolean equals( Object o )
{
- if( o instanceof WikiName )
+ if( o instanceof WikiPath )
{
- WikiName n = (WikiName) o;
+ WikiPath n = (WikiPath) o;
return m_space.equals( n.m_space ) && m_path.equals( n.m_path );
}
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=764449&r1=764448&r2=764449&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 13 13:28:07 2009
@@ -42,7 +42,7 @@
import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.acl.Acl;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
@@ -439,7 +439,7 @@
{
if( page == null || page.length() == 0 ) return null;
- return m_engine.getFinalPageName( WikiName.valueOf( page ) ).toString();
+ return m_engine.getFinalPageName( WikiPath.valueOf( page ) ).toString();
}
catch( Exception e )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java Mon Apr 13 13:28:07 2009
@@ -33,7 +33,7 @@
import org.apache.wiki.api.PluginException;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.parser.MarkupParser;
@@ -265,9 +265,9 @@
{
pageName = ((WikiPage) objectje).getName();
}
- else if ( objectje instanceof WikiName )
+ else if ( objectje instanceof WikiPath )
{
- pageName = ((WikiName) objectje).toString();
+ pageName = ((WikiPath) objectje).toString();
}
else if ( objectje instanceof String )
{
@@ -315,7 +315,7 @@
boolean isAttachment = pageName.contains( "/" );
if( !isAttachment || (isAttachment && m_showAttachments) )
{
- if( objectje instanceof WikiPage || objectje instanceof WikiName || objectje instanceof String )
+ if( objectje instanceof WikiPage || objectje instanceof WikiPath || objectje instanceof String )
{
result.add( objectje );
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java Mon Apr 13 13:28:07 2009
@@ -33,7 +33,7 @@
import org.apache.wiki.api.WikiException;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.PageAlreadyExistsException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.filters.RedirectException;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
@@ -168,7 +168,7 @@
WikiPage newPage;
try
{
- newPage = context.getEngine().createPage( WikiName.valueOf(pageName) );
+ newPage = context.getEngine().createPage( WikiPath.valueOf(pageName) );
}
catch( PageAlreadyExistsException e )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java Mon Apr 13 13:28:07 2009
@@ -31,7 +31,7 @@
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.permissions.PermissionFactory;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.util.TextUtil;
@@ -102,7 +102,7 @@
WikiPage page = null;
try
{
- WikiName pageName = engine.getFinalPageName( context.getPage().getQualifiedName().resolve( includedPage ) );
+ WikiPath pageName = engine.getFinalPageName( context.getPage().getWikiPath().resolve( includedPage ) );
if( pageName != null )
{
page = engine.getPage( pageName );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java Mon Apr 13 13:28:07 2009
@@ -31,7 +31,7 @@
import org.apache.wiki.api.PluginException;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.providers.ProviderException;
@@ -94,7 +94,7 @@
{
WikiPage page = context.getEngine().getPage( pageName );
- Collection<WikiName> links = refmgr.findReferrers( page.getQualifiedName() );
+ Collection<WikiPath> links = refmgr.findReferrers( page.getWikiPath() );
String wikitext = "";
super.initialize( context, params );
@@ -115,7 +115,7 @@
// FIXME: Having to copy all of these is kinda stupid.
Collection<String> tmpList = new ArrayList<String>();
- for( WikiName wn : links ) tmpList.add( wn.toString() );
+ for( WikiPath wn : links ) tmpList.add( wn.toString() );
tmpList= filterCollection( tmpList );
wikitext = wikitizeCollection( tmpList, m_separator, items );
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=764449&r1=764448&r2=764449&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 13 13:28:07 2009
@@ -29,7 +29,7 @@
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.content.WikiPath;
import org.apache.wiki.content.lock.PageLock;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
@@ -164,7 +164,7 @@
WikiPage page;
try
{
- page = mgr.getEngine().createPage( WikiName.valueOf(name) );
+ page = mgr.getEngine().createPage( WikiPath.valueOf(name) );
}
catch( PageAlreadyExistsException e )
{
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=764449&r1=764448&r2=764449&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 13 13:28:07 2009
@@ -474,7 +474,7 @@
//
if( pageDay != null && pageDay.after(start) && pageDay.before(end) )
{
- WikiPage firstVersion = mgr.getPage( p.getQualifiedName(), 1 );
+ WikiPage firstVersion = mgr.getPage( p.getWikiPath(), 1 );
result.add( firstVersion );
}
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java Mon Apr 13 13:28:07 2009
@@ -30,7 +30,7 @@
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.event.WikiEvent;
import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WikiEventUtils;
@@ -345,7 +345,7 @@
m_documentCache.flushPattern( pageName );
try
{
- Collection<WikiName> referringPages = m_engine.getReferenceManager().findReferrers( WikiName.valueOf(pageName) );
+ Collection<WikiPath> referringPages = m_engine.getReferenceManager().findReferrers( WikiPath.valueOf(pageName) );
//
// Flush also those pages that refer to this page (if an nonexistant page
@@ -356,7 +356,7 @@
Iterator i = referringPages.iterator();
while (i.hasNext())
{
- WikiName page = (WikiName) i.next();
+ WikiPath page = (WikiPath) i.next();
if( log.isDebugEnabled() ) log.debug( "Flushing " + page );
m_documentCache.flushPattern( page.toString() );
}
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=764449&r1=764448&r2=764449&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 13 13:28:07 2009
@@ -36,7 +36,7 @@
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.plugin.WeblogEntryPlugin;
@@ -151,7 +151,7 @@
WikiPage entryPage;
try
{
- entryPage = m_engine.createPage( WikiName.valueOf( pageName ) );
+ entryPage = m_engine.createPage( WikiPath.valueOf( pageName ) );
}
catch( PageAlreadyExistsException e )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java Mon Apr 13 13:28:07 2009
@@ -29,7 +29,7 @@
import org.apache.wiki.auth.permissions.PagePermission;
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.providers.ProviderException;
@@ -315,7 +315,7 @@
// This is ugly
try
{
- context.setPage( m_engine.createPage( WikiName.valueOf( "__DUMMY" ) ) );
+ context.setPage( m_engine.createPage( WikiPath.valueOf( "__DUMMY" ) ) );
}
catch( PageAlreadyExistsException e )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java Mon Apr 13 13:28:07 2009
@@ -51,7 +51,7 @@
import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.parser.MarkupParser;
@@ -626,7 +626,7 @@
log.error("Lucene found a result page '" + pageName + "' that could not be loaded, removing from Lucene cache");
try
{
- page = m_engine.createPage( WikiName.valueOf( pageName ) );
+ page = m_engine.createPage( WikiPath.valueOf( pageName ) );
pageRemoved( page );
m_engine.deletePage( pageName );
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.java Mon Apr 13 13:28:07 2009
@@ -33,7 +33,7 @@
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.parser.JSPWikiMarkupParser;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.providers.ProviderException;
@@ -259,16 +259,16 @@
reallink = MarkupParser.cleanLink( reallink );
- WikiName matchedLink;
+ WikiPath matchedLink;
String sectref = "";
- if( (matchedLink = engine.getFinalPageName( WikiName.valueOf(reallink) )) != null )
+ if( (matchedLink = engine.getFinalPageName( WikiPath.valueOf(reallink) )) != null )
{
sectref = "section-"+engine.encodeName(matchedLink.getPath())+"-"+namedSection;
sectref = "#"+sectref.replace('%', '_');
}
else
{
- matchedLink = WikiName.valueOf(reallink);
+ matchedLink = WikiPath.valueOf(reallink);
}
url = makeBasicURL( m_context, matchedLink.toString(), parms, m_absolute ) + sectref;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java Mon Apr 13 13:28:07 2009
@@ -26,7 +26,7 @@
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.providers.ProviderException;
import net.sourceforge.stripes.controller.StripesFilter;
@@ -77,7 +77,7 @@
{
try
{
- WikiName finalName = engine.getFinalPageName( WikiName.valueOf( pageName ) );
+ WikiPath finalName = engine.getFinalPageName( WikiPath.valueOf( pageName ) );
if ( finalName == null )
{
errors.add( new LocalizableError( "common.nopage", pageName ) );
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=764449&r1=764448&r2=764449&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 13 13:28:07 2009
@@ -36,7 +36,7 @@
import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.permissions.PermissionFactory;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.plugin.WeblogEntryPlugin;
@@ -306,7 +306,7 @@
String pageName = plugin.getNewEntryPage( engine, blogid );
- WikiPage entryPage = engine.createPage( WikiName.valueOf( pageName ) );
+ WikiPage entryPage = engine.createPage( WikiPath.valueOf( pageName ) );
entryPage.setAuthor( username );
WikiContext context = engine.getWikiContextFactory().newViewContext( entryPage );
@@ -366,7 +366,7 @@
byte[] data = (byte[]) content.get( "bits" );
AttachmentManager attmgr = engine.getAttachmentManager();
- Attachment att = engine.getContentManager().addPage( WikiName.valueOf( blogid ).resolve( name ),
+ Attachment att = engine.getContentManager().addPage( WikiPath.valueOf( blogid ).resolve( name ),
"application/octet-stream"); //FIXME! Needs a better guess
att.setAuthor( username );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java Mon Apr 13 13:28:07 2009
@@ -32,7 +32,7 @@
import junit.framework.TestSuite;
import org.apache.wiki.api.WikiException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.providers.AbstractFileProvider;
import org.apache.wiki.providers.ProviderException;
@@ -98,22 +98,22 @@
}
/** Shortcut to help testing. */
- private Set<WikiName> findReferrers( String path ) throws ProviderException
+ private Set<WikiPath> findReferrers( String path ) throws ProviderException
{
- return mgr.findReferrers( WikiName.valueOf(path) );
+ return mgr.findReferrers( WikiPath.valueOf(path) );
}
public void testNonExistant1()
throws Exception
{
- Collection<WikiName> c = mgr.findReferrers( WikiName.valueOf("Foobar2") );
+ Collection<WikiPath> c = mgr.findReferrers( WikiPath.valueOf("Foobar2") );
- assertTrue( c.size() == 1 && c.contains( WikiName.valueOf("Foobar") ) );
+ assertTrue( c.size() == 1 && c.contains( WikiPath.valueOf("Foobar") ) );
}
public void testNonExistant2() throws ProviderException
{
- Collection<WikiName> c = findReferrers("TestBug");
+ Collection<WikiPath> c = findReferrers("TestBug");
assertTrue( c.size() == 0 );
}
@@ -121,7 +121,7 @@
public void testRemove()
throws Exception
{
- Collection<WikiName> c = findReferrers("Foobar2");
+ Collection<WikiPath> c = findReferrers("Foobar2");
assertTrue( c.size() == 1 && c.contains("Foobar") );
@@ -175,14 +175,14 @@
public void testReferrers()
throws Exception
{
- Collection<WikiName> c = findReferrers( "TestPage" );
+ Collection<WikiPath> c = findReferrers( "TestPage" );
assertNull( "TestPage referrers", c );
c = findReferrers( "Foobar" );
assertTrue( "Foobar referrers", c.size()==2 );
c = findReferrers( "Foobar2" );
- assertTrue( "Foobar2 referrers", c.size()==1 && ((WikiName) c.iterator().next()).equals("Foobar") );
+ assertTrue( "Foobar2 referrers", c.size()==1 && ((WikiPath) c.iterator().next()).equals("Foobar") );
c = findReferrers( "Foobars" );
assertEquals( "Foobars referrers", 2, c.size() );
@@ -210,7 +210,7 @@
engine.saveText( "FatalBugs", "<foo>" );
engine.saveText( "BugCommentPreviewDeletesAllComments", "FatalBug" );
- Collection<WikiName> c = findReferrers( "FatalBugs" );
+ Collection<WikiPath> c = findReferrers( "FatalBugs" );
assertEquals( "FatalBugs referrers number", 2, c.size() );
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java Mon Apr 13 13:28:07 2009
@@ -47,7 +47,7 @@
import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.PageNotFoundException;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.providers.AbstractFileProvider;
@@ -323,7 +323,7 @@
public void addAttachment( String pageName, String attachmentName, byte[] data )
throws PageAlreadyExistsException, ProviderException, IOException
{
- Attachment att = getContentManager().addPage( WikiName.valueOf( pageName ).resolve( attachmentName ), "application/octet-stream" );
+ Attachment att = getContentManager().addPage( WikiPath.valueOf( pageName ).resolve( attachmentName ), "application/octet-stream" );
att.setContent( new ByteArrayInputStream(data) );
@@ -366,7 +366,7 @@
{
try
{
- page = createPage( WikiName.valueOf( pageName ) );
+ page = createPage( WikiPath.valueOf( pageName ) );
}
catch( PageAlreadyExistsException e1 )
{
@@ -399,7 +399,7 @@
WikiPage page;
try
{
- page = createPage( WikiName.valueOf( pageName ) );
+ page = createPage( WikiPath.valueOf( pageName ) );
}
catch( PageAlreadyExistsException e1 )
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java Mon Apr 13 13:28:07 2009
@@ -29,7 +29,7 @@
import org.apache.wiki.NoSuchVariableException;
import org.apache.wiki.VariableManager;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.preferences.Preferences.TimeFormat;
@@ -63,7 +63,7 @@
m_variableManager = new VariableManager( props );
testEngine = new TestEngine( props );
testEngine.deletePage( PAGE_NAME );
- m_context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage(WikiName.valueOf(PAGE_NAME)) );
+ m_context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage(WikiPath.valueOf(PAGE_NAME)) );
}
catch( IOException e ) {}
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=764449&r1=764448&r2=764449&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 13 13:28:07 2009
@@ -26,7 +26,7 @@
import java.util.*;
import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.providers.*;
import org.apache.wiki.util.FileUtil;
import org.apache.wiki.util.TextUtil;
@@ -121,10 +121,10 @@
m_engine.saveText( "Foobars", "2" );
assertEquals( "plural mistake", "Foobars",
- m_engine.getFinalPageName( WikiName.valueOf("Foobars") ) );
+ m_engine.getFinalPageName( WikiPath.valueOf("Foobars") ) );
assertEquals( "singular mistake", "Foobar",
- m_engine.getFinalPageName( WikiName.valueOf("Foobar" )) );
+ m_engine.getFinalPageName( WikiPath.valueOf("Foobar" )) );
}
public void testFinalPageNameSingular()
@@ -133,9 +133,9 @@
m_engine.saveText( "Foobar", "1" );
assertEquals( "plural mistake", "Foobar",
- m_engine.getFinalPageName( WikiName.valueOf("Foobars") ) );
+ m_engine.getFinalPageName( WikiPath.valueOf("Foobars") ) );
assertEquals( "singular mistake", "Foobar",
- m_engine.getFinalPageName( WikiName.valueOf("Foobar") ) );
+ m_engine.getFinalPageName( WikiPath.valueOf("Foobar") ) );
}
public void testFinalPageNamePlural()
@@ -144,9 +144,9 @@
m_engine.saveText( "Foobars", "1" );
assertEquals( "plural mistake", "Foobars",
- m_engine.getFinalPageName( WikiName.valueOf("Foobars") ) );
+ m_engine.getFinalPageName( WikiPath.valueOf("Foobars") ) );
assertEquals( "singular mistake", "Foobars",
- m_engine.getFinalPageName( WikiName.valueOf("Foobar") ) );
+ m_engine.getFinalPageName( WikiPath.valueOf("Foobar") ) );
}
public void testPutPage()
@@ -243,7 +243,7 @@
String src="Foobar. [Foobar]. Frobozz. [This is a link].";
m_engine.deletePage( "Test" );
- Object[] result = m_engine.scanWikiLinks( m_engine.createPage( WikiName.valueOf( "Test" ) ), src ).toArray();
+ Object[] result = m_engine.scanWikiLinks( m_engine.createPage( WikiPath.valueOf( "Test" ) ), src ).toArray();
assertEquals( "item 0", "Foobar", result[0] );
assertEquals( "item 1", "This is a link", result[1] );
@@ -871,7 +871,7 @@
m_engine.saveText( "RenameBugTestPage", "Mary had a little generic object" );
m_engine.saveText( "OldNameTestPage", "Linked to RenameBugTestPage" );
- Collection<WikiName> pages = m_engine.getReferenceManager().findReferrers( WikiName.valueOf("RenameBugTestPage") );
+ Collection<WikiPath> pages = m_engine.getReferenceManager().findReferrers( WikiPath.valueOf("RenameBugTestPage") );
assertEquals( "has one", "OldNameTestPage", pages.iterator().next() );
WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( m_engine.getPage("OldNameTestPage") );
@@ -881,7 +881,7 @@
assertFalse( "did not vanish", m_engine.pageExists( "OldNameTestPage") );
assertTrue( "did not appear", m_engine.pageExists( "NewNameTestPage") );
- pages = m_engine.getReferenceManager().findReferrers( WikiName.valueOf("RenameBugTestPage") );
+ pages = m_engine.getReferenceManager().findReferrers( WikiPath.valueOf("RenameBugTestPage") );
assertEquals( "wrong # of referrers", 1, pages.size() );
@@ -891,7 +891,7 @@
public void testChangeNoteOldVersion2() throws Exception
{
m_engine.deletePage( NAME1 );
- WikiPage p = m_engine.createPage( WikiName.valueOf( NAME1 ) );
+ WikiPage p = m_engine.createPage( WikiPath.valueOf( NAME1 ) );
WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
@@ -934,7 +934,7 @@
throws Exception
{
m_engine.deletePage( NAME1 );
- WikiPage page = m_engine.createPage( WikiName.valueOf( NAME1 ) );
+ WikiPage page = m_engine.createPage( WikiPath.valueOf( NAME1 ) );
assertEquals( "Page does not exist",
true,
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java?rev=764449&r1=764448&r2=764449&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java Mon Apr 13 13:28:07 2009
@@ -26,7 +26,7 @@
import org.apache.wiki.action.RenameActionBean;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.auth.Users;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -151,8 +151,8 @@
m_engine.saveText("ReferstoTest", "This page refers to [Test].\n");
WikiPage referringPage = m_engine.getPage("ReferstoTest");
assertNotNull("Did not save page ReferstoTest!", referringPage );
- assertNotNull( m_engine.getReferenceManager().findReferrers(WikiName.valueOf("Test")) );
- assertEquals( 1, m_engine.getReferenceManager().findReferrers(WikiName.valueOf("Test")).size() );
+ assertNotNull( m_engine.getReferenceManager().findReferrers(WikiPath.valueOf("Test")) );
+ assertEquals( 1, m_engine.getReferenceManager().findReferrers(WikiPath.valueOf("Test")).size() );
MockRoundtrip trip;
ValidationErrors errors;
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=764449&r1=764448&r2=764449&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 13 13:28:07 2009
@@ -10,7 +10,7 @@
import org.apache.wiki.api.WikiException;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.ContentManager;
-import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.WikiPath;
public class ContentManagerTest extends TestCase
@@ -36,7 +36,7 @@
{
try
{
- WikiPage p = m_mgr.getPage( WikiName.valueOf("Main:TestPage") );
+ WikiPage p = m_mgr.getPage( WikiPath.valueOf("Main:TestPage") );
if( p != null ) m_mgr.deletePage( p );
}
@@ -56,7 +56,7 @@
public void testBasicGet() throws Exception
{
String content = "Test Content";
- WikiPage page = m_mgr.addPage( WikiName.valueOf("Main:TestPage"), ContentManager.JSPWIKI_CONTENT_TYPE );
+ WikiPage page = m_mgr.addPage( WikiPath.valueOf("Main:TestPage"), ContentManager.JSPWIKI_CONTENT_TYPE );
assertNotNull("WikiPage create", page);
@@ -64,7 +64,7 @@
page.save();
- WikiPage page2 = m_mgr.getPage( WikiName.valueOf("Main:TestPage") );
+ WikiPage page2 = m_mgr.getPage( WikiPath.valueOf("Main:TestPage") );
assertNotNull( "page2", page2 );
@@ -75,7 +75,7 @@
public void testBasicGetDefaultSpace() throws Exception
{
String content = "Test Content";
- WikiPage page = m_mgr.addPage( WikiName.valueOf("TestPage"), ContentManager.JSPWIKI_CONTENT_TYPE );
+ WikiPage page = m_mgr.addPage( WikiPath.valueOf("TestPage"), ContentManager.JSPWIKI_CONTENT_TYPE );
assertNotNull("WikiPage create", page);
@@ -83,7 +83,7 @@
page.save();
- WikiPage page2 = m_mgr.getPage( WikiName.valueOf("TestPage") );
+ WikiPage page2 = m_mgr.getPage( WikiPath.valueOf("TestPage") );
assertNotNull( "page2", page2 );
@@ -93,9 +93,9 @@
public void testPaths() throws Exception
{
- assertEquals( "One", "/pages/Main/MainPage", ContentManager.getJCRPath( WikiName.valueOf("Main:MainPage") ) );
+ assertEquals( "One", "/pages/Main/MainPage", ContentManager.getJCRPath( WikiPath.valueOf("Main:MainPage") ) );
- assertEquals( "Back", WikiName.valueOf("Main:MainPage"), ContentManager.getWikiPath( "/pages/Main/MainPage" ) );
+ assertEquals( "Back", WikiPath.valueOf("Main:MainPage"), ContentManager.getWikiPath( "/pages/Main/MainPage" ) );
}
public static Test suite()