Author: jalkanen
Date: Thu Dec 3 20:47:56 2009
New Revision: 886916
URL: http://svn.apache.org/viewvc?rev=886916&view=rev
Log:
JSPWIKI-616: WikiPageEvent now takes in a WikiPath instead of
String.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/ContentEvent.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/PageEventFilter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageEvent.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageRenameEvent.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/FilterManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=886916&r1=886915&r2=886916&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Dec 3 20:47:56 2009
@@ -1,5 +1,10 @@
2009-12-03 Janne Jalkanen <[email protected]>
+ * 3.0.0-svn-189
+
+ * JSPWIKI-616: WikiPageEvent now takes in a WikiPath instead of
+ String.
+
* 3.0.0-svn-188
* Fixed ContentManager.checkin() to use a separate Session for
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=886916&r1=886915&r2=886916&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Thu Dec 3
20:47:56 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "188";
+ public static final String BUILD = "189";
/**
* This is the generic version string you should use
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=886916&r1=886915&r2=886916&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
Thu Dec 3 20:47:56 2009
@@ -526,7 +526,7 @@
nd.save();
}
- fireEvent( ContentEvent.NODE_SAVED, page.getName(), NO_ARGS );
+ fireEvent( ContentEvent.NODE_SAVED, page.getPath(), NO_ARGS );
}
/**
@@ -770,7 +770,7 @@
synchronized( m_pageLocks )
{
- fireEvent( WikiPageEvent.PAGE_LOCK, page.getName(), NO_ARGS ); //
prior to or after actual lock?
+ fireEvent( WikiPageEvent.PAGE_LOCK, page.getPath(), NO_ARGS ); //
prior to or after actual lock?
lock = m_pageLocks.get( page.getName() );
@@ -808,12 +808,12 @@
synchronized( m_pageLocks )
{
- m_pageLocks.remove( lock.getPage() );
+ m_pageLocks.remove( lock.getPath() );
log.debug( "Released lock " + lock );
}
- fireEvent( WikiPageEvent.PAGE_UNLOCK, lock.getPage(), NO_ARGS );
+ fireEvent( WikiPageEvent.PAGE_UNLOCK, lock.getPath(), NO_ARGS );
}
/**
@@ -1102,7 +1102,7 @@
// Page has changed, so let's notify others.
// FIXME: I'm not sure whether we should fire in what case.
//
- fireEvent( ContentEvent.NODE_SAVED, page.getName(), NO_ARGS );
+ fireEvent( ContentEvent.NODE_SAVED, page.getPath(), NO_ARGS );
return true;
}
@@ -1150,7 +1150,7 @@
public boolean deletePage( WikiPage page )
throws ProviderException
{
- fireEvent( ContentEvent.NODE_DELETE_REQUEST, page.getName(), NO_ARGS );
+ fireEvent( ContentEvent.NODE_DELETE_REQUEST, page.getPath(), NO_ARGS );
try
{
@@ -1161,7 +1161,7 @@
nd.getParent().save();
- fireEvent( ContentEvent.NODE_DELETED, page.getName(), NO_ARGS );
+ fireEvent( ContentEvent.NODE_DELETED, page.getPath(), NO_ARGS );
return true;
}
@@ -1474,7 +1474,7 @@
page.setAttribute( JCRWikiPage.ATTR_TITLE, renameTo );
// Tell everyone we moved the page
- fireEvent( ContentEvent.NODE_RENAMED, toPage.toString(),
fromPage.toString(), Boolean.valueOf( changeReferrers ) );
+ fireEvent( ContentEvent.NODE_RENAMED, toPage, fromPage,
Boolean.valueOf( changeReferrers ) );
//
// Done, return the new name.
@@ -1493,7 +1493,7 @@
* @param pagename the wiki page name as a String
* @param args additional arguments to pass to the event
*/
- protected final void fireEvent( int type, String pagename, Serializable...
args )
+ protected final void fireEvent( int type, WikiPath pagename,
Serializable... args )
{
if ( WikiEventManager.isListening(this) )
{
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java?rev=886916&r1=886915&r2=886916&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
Thu Dec 3 20:47:56 2009
@@ -323,8 +323,7 @@
return;
}
- String pageName = ((WikiPageEvent) event).getPageName();
- WikiPath path = pageName == null ? null : WikiPath.valueOf( pageName );
+ WikiPath path = ((WikiPageEvent) event).getPath();
if( !isWikiPage( path ) )
{
return;
@@ -366,7 +365,7 @@
case (ContentEvent.NODE_RENAMED ): {
WikiPath toPage = path;
- WikiPath fromPage = WikiPath.valueOf( (String)
((WikiPageEvent) event).getArgs()[0] );
+ WikiPath fromPage = (WikiPath) ((WikiPageEvent)
event).getArgs()[0];
Boolean changeReferrers = (Boolean) ((WikiPageEvent)
event).getArgs()[1];
List<WikiPath> referrers = getReferredBy( fromPage );
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java?rev=886916&r1=886915&r2=886916&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java
Thu Dec 3 20:47:56 2009
@@ -24,6 +24,7 @@
import java.util.Date;
import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.content.WikiPath;
/**
* Describes a lock acquired by an user on a page. For the most part,
@@ -38,7 +39,7 @@
{
private static final long serialVersionUID = 0L;
- private String m_page;
+ private WikiPath m_page;
private String m_locker;
private Date m_lockAcquired;
private Date m_lockExpiry;
@@ -56,7 +57,7 @@
Date acquired,
Date expiry )
{
- m_page = page.getName();
+ m_page = page.getPath();
m_locker = locker;
m_lockAcquired = (Date)acquired.clone();
m_lockExpiry = (Date)expiry.clone();
@@ -67,7 +68,7 @@
*
* @return The name of the page.
*/
- public String getPage()
+ public WikiPath getPath()
{
return m_page;
}
@@ -130,6 +131,6 @@
*/
public String toString()
{
- return "pagename:" + getPage() + ",locker:" + getLocker() +
",acquired:" + getAcquisitionTime() + ",expiry:" + getExpiryTime();
+ return "pagename:" + getPath() + ",locker:" + getLocker() +
",acquired:" + getAcquisitionTime() + ",expiry:" + getExpiryTime();
}
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/ContentEvent.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/event/ContentEvent.java?rev=886916&r1=886915&r2=886916&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/event/ContentEvent.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/event/ContentEvent.java
Thu Dec 3 20:47:56 2009
@@ -22,6 +22,8 @@
import java.io.Serializable;
+import org.apache.wiki.content.WikiPath;
+
/**
* Events fired by {...@link org.apache.wiki.content.ContentManager} when
nodes are
* created, saved or deleted.
@@ -43,7 +45,13 @@
public static final int NODE_DELETED = 221;
/**
- * Indicates that a node was successfully renamed.
+ * Indicates that a node was successfully renamed.
+ * Parameters are:
+ * <ul>
+ * <li>pagename = page which has been renamed
+ * <li>first argument (String) = the new name of the page (FQN)
+ * <li>second argument (Boolean) = true, if the referrers should be
changed.
+ * </ul>
*/
public static final int NODE_RENAMED = 211;
@@ -61,7 +69,7 @@
* @param pagename the WikiPage being acted upon.
* @param args additional arguments passed to the event.
*/
- public ContentEvent( Object src, int type, String pagename,
Serializable... args )
+ public ContentEvent( Object src, int type, WikiPath pagename,
Serializable... args )
{
super( src, type, pagename, args );
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/PageEventFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/event/PageEventFilter.java?rev=886916&r1=886915&r2=886916&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/event/PageEventFilter.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/event/PageEventFilter.java
Thu Dec 3 20:47:56 2009
@@ -162,7 +162,7 @@
WikiPageEvent event = new WikiPageEvent(
context.getEngine(),
type,
- context.getPage().getName());
+ context.getPage().getPath());
WikiEventManager.fireEvent(this,event);
}
}
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=886916&r1=886915&r2=886916&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
Thu Dec 3 20:47:56 2009
@@ -23,6 +23,8 @@
import java.io.Serializable;
+import org.apache.wiki.content.WikiPath;
+
/**
* WikiPageEvent indicates a change in the state or processing of a WikiPage.
* There are basically two types of page events:
@@ -184,7 +186,7 @@
* @since 2.4.65 */
public static final int PAGE_DELETED = ContentEvent.NODE_DELETED;
- private final String m_pagename;
+ private final WikiPath m_page;
// ............
@@ -197,10 +199,10 @@
* @param pagename the WikiPage being acted upon.
* @param args additional arguments passed to the event.
*/
- public WikiPageEvent( Object src, int type, String pagename,
Serializable... args )
+ public WikiPageEvent( Object src, int type, WikiPath page, Serializable...
args )
{
super( src, type, args );
- m_pagename = pagename;
+ m_page = page;
}
/**
@@ -209,9 +211,9 @@
*
* @return the Wiki page name associated with this WikiEvent, or null.
*/
- public String getPageName()
+ public WikiPath getPath()
{
- return m_pagename;
+ return m_page;
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageRenameEvent.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageRenameEvent.java?rev=886916&r1=886915&r2=886916&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageRenameEvent.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageRenameEvent.java
Thu Dec 3 20:47:56 2009
@@ -21,6 +21,8 @@
package org.apache.wiki.event;
+import org.apache.wiki.content.WikiPath;
+
/**
* WikiPageRenameEvent extends WikiPageEvent to indicate a change in
* the name of a WikiPage.
@@ -39,7 +41,7 @@
* generated by {...@link org.apache.wiki.content.PageRenamer}. */
public static final int PAGE_RENAMED = 28;
- private String m_oldpagename = null;
+ private WikiPath m_oldpagename = null;
// ............
@@ -51,7 +53,7 @@
* @param oldname the old name of the WikiPage being acted upon.
* @param newname the new name of the WikiPage being acted upon.
*/
- public WikiPageRenameEvent( Object src, String oldname, String newname )
+ public WikiPageRenameEvent( Object src, WikiPath oldname, WikiPath newname
)
{
super( src, PAGE_RENAMED, newname );
m_oldpagename = oldname;
@@ -64,7 +66,7 @@
*
* @return the old Wiki page name associated with this WikiEvent, or
null.
*/
- public String getOldPageName()
+ public WikiPath getOldPath()
{
return m_oldpagename;
}
@@ -77,9 +79,9 @@
*
* @return the new Wiki page name associated with this WikiEvent, or
null.
*/
- public String getNewPageName()
+ public WikiPath getNewPath()
{
- return super.getPageName();
+ return super.getPath();
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/FilterManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/FilterManager.java?rev=886916&r1=886915&r2=886916&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/FilterManager.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/FilterManager.java
Thu Dec 3 20:47:56 2009
@@ -33,6 +33,7 @@
import org.apache.wiki.api.FilterException;
import org.apache.wiki.api.WikiException;
import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiPageEvent;
import org.apache.wiki.log.Logger;
@@ -443,7 +444,7 @@
if ( WikiEventManager.isListening( this ) &&
WikiPageEvent.isValidType( type ) )
{
WikiPage page = context.getPage();
- String pageName = page == null ? "(no page)" : page.getName();
+ WikiPath pageName = page == null ? null : page.getPath();
WikiEventManager.fireEvent( this, new WikiPageEvent(
m_engine,type,pageName ) );
}
}
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=886916&r1=886915&r2=886916&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
Thu Dec 3 20:47:56 2009
@@ -74,7 +74,7 @@
PageLock lock = i.next();
result.append( rowNum % 2 != 0 ? "<tr class=\"odd\">" : "<tr>"
);
- result.append("<td>"+lock.getPage()+"</td>");
+ result.append("<td>"+lock.getPath().toString()+"</td>");
result.append("<td>"+lock.getLocker()+"</td>");
result.append("<td>"+lock.getAcquisitionTime()+"</td>");
result.append("<td>"+lock.getExpiryTime()+"</td>");
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=886916&r1=886915&r2=886916&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
Thu Dec 3 20:47:56 2009
@@ -211,7 +211,7 @@
protected WikiDocument getRenderedDocument( WikiContext context, String
pagedata )
throws IOException
{
- String pageid =
context.getRealPage().getName()+VERSION_DELIMITER+context.getRealPage().getVersion();
+ String pageid =
context.getRealPage().getPath().toString().toLowerCase()+VERSION_DELIMITER+context.getRealPage().getVersion();
if( m_documentCache != null )
{
@@ -357,13 +357,13 @@
{
if( m_documentCache != null )
{
- String pageName = ((WikiPageEvent) event).getPageName();
+ WikiPath pageName = ((WikiPageEvent) event).getPath();
- flushCache( pageName );
+ flushCache( pageName.toString() );
try
{
- Collection<WikiPath> referringPages =
m_engine.getReferenceManager().getReferredBy( WikiPath.valueOf(pageName) );
+ Collection<WikiPath> referringPages =
m_engine.getReferenceManager().getReferredBy(pageName);
//
// Flush also those pages that refer to this page (if an
nonexistant page
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java?rev=886916&r1=886915&r2=886916&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java
Thu Dec 3 20:47:56 2009
@@ -31,6 +31,7 @@
import org.apache.wiki.api.WikiException;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.PageNotFoundException;
+import org.apache.wiki.content.WikiPath;
import org.apache.wiki.event.*;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
@@ -353,7 +354,7 @@
return;
}
- String pageName = ((WikiPageEvent) event).getPageName();
+ WikiPath pageName = ((WikiPageEvent) event).getPath();
switch ( event.getType() )
{
// If page was deleted, remove it from the index
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=886916&r1=886915&r2=886916&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java Thu
Dec 3 20:47:56 2009
@@ -774,7 +774,7 @@
pages = m_engine.getReferenceManager().getReferredBy(
WikiPath.valueOf("RenameBugTestPage") );
assertEquals( "wrong # of referrers", 1, pages.size() );
- assertEquals( "has wrong referrer", "Main:NewNameTestPage",
pages.iterator().next().toString() );
+ assertEquals( "has wrong referrer",
WikiPath.valueOf("Main:NewNameTestPage"), pages.iterator().next() );
}
public void testChangeNoteOldVersion2() throws Exception
