You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2010/02/27 18:18:52 UTC
svn commit: r916993 - in /incubator/jspwiki/trunk: ./
src/java/org/apache/wiki/ src/java/org/apache/wiki/plugin/
tests/java/org/apache/wiki/ tests/java/org/apache/wiki/plugin/
Author: metskem
Date: Sat Feb 27 17:18:52 2010
New Revision: 916993
URL: http://svn.apache.org/viewvc?rev=916993&view=rev
Log:
3.0.0-svn-210
* fixed a couple of Plugin unit tests (support for wiki spaces is
not yet there), only the ReferringPagesPlugin still fails.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/IndexPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=916993&r1=916992&r2=916993&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Feb 27 17:18:52 2010
@@ -1,3 +1,10 @@
+2010-01-06 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-210
+
+ * fixed a couple of Plugin unit tests (support for wiki spaces is
+ not yet there), only the ReferringPagesPlugin still fails.
+
2010-02-23 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-209
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=916993&r1=916992&r2=916993&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat Feb 27 17:18:52 2010
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "209";
+ public static final String BUILD = "210";
/**
* This is the generic version string you should use
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=916993&r1=916992&r2=916993&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 Sat Feb 27 17:18:52 2010
@@ -181,7 +181,8 @@
for( int i = 0; i < ptrns.length; i++ )
{
- String pattern = sanitizePattern( ptrns[i] );
+ String pattern = ptrns[i];
+// String pattern = sanitizePattern( ptrns[i] );
m_exclude[i] = Pattern
.compile( RegExpUtil.globToPerl5( pattern.toCharArray(),
RegExpUtil.DEFAULT_MASK ) );
@@ -208,7 +209,8 @@
for( int i = 0; i < ptrns.length; i++ )
{
- String pattern = sanitizePattern( ptrns[i] );
+ String pattern = ptrns[i] ;
+// String pattern = sanitizePattern( ptrns[i] );
m_include[i] = Pattern
.compile( RegExpUtil.globToPerl5( pattern.toCharArray(),
RegExpUtil.DEFAULT_MASK ) );
@@ -309,11 +311,11 @@
{
if( item instanceof WikiPage )
{
- return ((WikiPage) item).getPath().toString();
+ return ((WikiPage) item).getName();
}
else if ( item instanceof WikiPath )
{
- return ((WikiPath) item).toString();
+ return ((WikiPath) item).getName();
}
else if ( item instanceof String )
{
@@ -479,7 +481,7 @@
//
while( it.hasNext() && ( (count < maxItems) || ( maxItems == ALL_ITEMS ) ) )
{
- WikiPath link = it.next();
+ String link = it.next().getName();
if( count > 0 )
{
@@ -490,8 +492,7 @@
markup.append( m_before );
// Make a Wiki markup link. See TranslatorReader.
- String page = ContentManager.DEFAULT_SPACE.equals( link.getSpace() ) ? link.getPath() : link.toString();
- markup.append( "[" + m_engine.beautifyTitle( link ) + "|" + page + "]" );
+ markup.append( "[" + m_engine.beautifyTitle( link ) + "|" + link + "]" );
count++;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/IndexPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/IndexPlugin.java?rev=916993&r1=916992&r2=916993&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/IndexPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/IndexPlugin.java Sat Feb 27 17:18:52 2010
@@ -27,7 +27,6 @@
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.PluginException;
import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.content.ContentManager;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.providers.ProviderException;
@@ -60,7 +59,7 @@
indexDiv.setClass( "header" );
try
{
- List<WikiPage> pages = context.getEngine().getContentManager().getAllPages( ContentManager.DEFAULT_SPACE );
+ List<WikiPage> pages = context.getEngine().getContentManager().getAllPages( null );
pages = super.filterCollection( pages );
Collections.sort( pages );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java?rev=916993&r1=916992&r2=916993&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java Sat Feb 27 17:18:52 2010
@@ -108,7 +108,7 @@
// FIXME: Should really have a since date on the getRecentChanges
// method.
- List<WikiPage> changes = engine.getRecentChanges( context.getPage().getWiki() );
+ List<WikiPage> changes = engine.getRecentChanges( null );
super.initialize( context, params );
changes = super.filterCollection( changes );
@@ -145,7 +145,7 @@
String link = context.getURL( pageref.isAttachment() ? WikiContext.ATTACH : WikiContext.VIEW,
pageref.getName() ) ;
- a linkel = new a(link,engine.beautifyTitle(pageref.getPath()));
+ a linkel = new a(link,engine.beautifyTitle(pageref.getName()));
tr row = new tr();
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java?rev=916993&r1=916992&r2=916993&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java Sat Feb 27 17:18:52 2010
@@ -26,7 +26,6 @@
import org.apache.wiki.*;
import org.apache.wiki.api.PluginException;
import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.content.ContentManager;
import org.apache.wiki.content.PageNotFoundException;
import org.apache.wiki.content.ReferenceManager;
import org.apache.wiki.content.WikiPath;
@@ -102,11 +101,6 @@
String includePattern = filterString( m_include );
String excludePattern = filterString( m_exclude );
- log.debug( "Fetching referred pages for "+ rootname +
- " with a depth of "+ m_depth +
- " with include pattern of "+ includePattern +
- " with exclude pattern of "+ excludePattern );
-
//
// do the actual work
//
@@ -116,12 +110,10 @@
"] format["+(m_formatCompact ? "compact" : "full") +
(m_formatSort ? " sort" : "") + "]";
- WikiPath root = WikiPath.valueOf( rootname );
- String rootString = ContentManager.DEFAULT_SPACE.equals( root.getSpace() ) ? root.getPath() : root.toString();
m_result.append("<div class=\"ReferredPagesPlugin\">\n");
m_result.append("<a class=\"wikipage\" href=\""+ href +
"\" title=\"" + title +
- "\">" + rootString + "</a>\n");
+ "\">" + rootname + "</a>\n");
m_exists.add(WikiPath.valueOf( rootname ) );
// pre compile all needed patterns
@@ -203,7 +195,7 @@
isUL = true; m_result.append("<ul>\n");
}
- m_result.append("<li> " + link + " </li>\n");
+ m_result.append("<li> " + link.getName() + " </li>\n");
getReferredPages( context, link, depth ); // recursive
}
@@ -215,9 +207,8 @@
isUL = true; m_result.append("<ul>\n");
}
- String href = context.getURL(WikiContext.VIEW,link.toString());
- String linkString = ContentManager.DEFAULT_SPACE.equals( link.getSpace() ) ? link.getPath() : link.toString();
- m_result.append("<li><a class=\"wikipage\" href=\""+ href +"\">"+linkString+"</a></li>\n" );
+ String href = context.getURL(WikiContext.VIEW,link.getName());
+ m_result.append("<li><a class=\"wikipage\" href=\""+ href +"\">"+link.getName()+"</a></li>\n" );
m_exists.add( link );
getReferredPages( context, link, depth );
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=916993&r1=916992&r2=916993&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 Sat Feb 27 17:18:52 2010
@@ -105,10 +105,6 @@
{
extras = rb.getString("referringpagesplugin.more");
}
-
- if( log.isDebugEnabled() )
- log.debug( "Fetching referring pages for "+page.getName()+
- " with a max of "+items);
if( links != null && links.size() > 0 )
{
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=916993&r1=916992&r2=916993&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java Sat Feb 27 17:18:52 2010
@@ -365,6 +365,9 @@
try
{
page = getPage( pageName );
+
+ if ( page == null ) throw new PageNotFoundException(pageName);
+
}
catch ( PageNotFoundException e )
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java?rev=916993&r1=916992&r2=916993&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java Sat Feb 27 17:18:52 2010
@@ -109,14 +109,14 @@
public void testReferredPageParmInclude() throws Exception
{
m_context = m_engine.getWikiContextFactory().newViewContext( null, null, m_engine.getPage( "IPointToTwoPages" ) );
- String expected = "<div class=\"ReferredPagesPlugin\">\n<a class=\"wikipage\" href=\"/Wiki.jsp?page=IPointToTwoPages\" title=\"ReferredPagesPlugin: depth[1] include[Main:SomeBodyPointsToMe.*] exclude[^$] format[compact]\">IPointToTwoPages</a>\n<ul>\n<li><a class=\"wikipage\" href=\"/Wiki.jsp?page=SomeBodyPointsToMe\">SomeBodyPointsToMe</a></li>\n<li><a class=\"wikipage\" href=\"/Wiki.jsp?page=SomeBodyPointsToMeToo\">SomeBodyPointsToMeToo</a></li>\n</ul>\n</div>\n";
+ String expected = "<div class=\"ReferredPagesPlugin\">\n<a class=\"wikipage\" href=\"/Wiki.jsp?page=IPointToTwoPages\" title=\"ReferredPagesPlugin: depth[1] include[SomeBodyPointsToMe.*] exclude[^$] format[compact]\">IPointToTwoPages</a>\n<ul>\n<li><a class=\"wikipage\" href=\"/Wiki.jsp?page=SomeBodyPointsToMe\">SomeBodyPointsToMe</a></li>\n<li><a class=\"wikipage\" href=\"/Wiki.jsp?page=SomeBodyPointsToMeToo\">SomeBodyPointsToMeToo</a></li>\n</ul>\n</div>\n";
String res = m_manager.execute( m_context,
"{INSERT org.apache.wiki.plugin.ReferredPagesPlugin include='SomeBodyPointsToMe*'}" );
assertEquals( expected, res );
res = m_manager.execute( m_context,
- "{INSERT org.apache.wiki.plugin.ReferredPagesPlugin include='Main:SomeBodyPointsToMe*'}" );
+ "{INSERT org.apache.wiki.plugin.ReferredPagesPlugin include='SomeBodyPointsToMe*'}" );
assertEquals( expected, res );
}