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 2008/12/20 12:42:33 UTC
svn commit: r728273 - in /incubator/jspwiki/trunk: src/com/ecyrd/jspwiki/
src/com/ecyrd/jspwiki/auth/acl/ src/com/ecyrd/jspwiki/dav/items/
src/com/ecyrd/jspwiki/providers/ src/com/ecyrd/jspwiki/rpc/atom/
src/com/ecyrd/jspwiki/rss/ src/com/ecyrd/jspwiki...
Author: jalkanen
Date: Sat Dec 20 03:42:31 2008
New Revision: 728273
URL: http://svn.apache.org/viewvc?rev=728273&view=rev
Log:
Switched to use WikiContextFactory.newViewContext(WikiPage) instead of the version with all the nulls in it.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java Sat Dec 20 03:42:31 2008
@@ -1505,7 +1505,7 @@
{
WikiPage page = getPage( pagename, version );
- WikiContext context = m_contextFactory.newViewContext( null, null, page );
+ WikiContext context = m_contextFactory.newViewContext( page );
String res = getHTML( context, page );
@@ -1574,7 +1574,7 @@
{
LinkCollector localCollector = new LinkCollector();
- textToHTML( m_contextFactory.newViewContext( null, null, page ),
+ textToHTML( m_contextFactory.newViewContext( page ),
pagedata,
localCollector,
null,
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java Sat Dec 20 03:42:31 2008
@@ -181,7 +181,7 @@
//
// Or, try parsing the page
//
- WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( null, null, page );
+ WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( page );
ctx.setVariable( RenderingManager.VAR_EXECUTE_PLUGINS, Boolean.FALSE );
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java Sat Dec 20 03:42:31 2008
@@ -76,7 +76,7 @@
{
WikiEngine engine = ((WikiDavProvider)m_provider).getEngine();
- WikiContext context = engine.getWikiContextFactory().newViewContext( null, null, m_page );
+ WikiContext context = engine.getWikiContextFactory().newViewContext( m_page );
context.setVariable( MarkupParser.PROP_RUNPLUGINS, "false" );
context.setVariable( WikiEngine.PROP_RUNFILTERS, "false" );
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java Sat Dec 20 03:42:31 2008
@@ -688,7 +688,7 @@
{
String data = m_provider.getPageText(page.getName(), page.getVersion());
- WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( null, null, page );
+ WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( page );
MarkupParser parser = mgr.getParser( ctx, data );
parser.parse();
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java Sat Dec 20 03:42:31 2008
@@ -285,7 +285,7 @@
String encodedName = TextUtil.urlEncodeUTF8( p.getName() );
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
String title = TextUtil.replaceEntities(BlogUtil.getSiteName(context));
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java Sat Dec 20 03:42:31 2008
@@ -232,7 +232,7 @@
StringBuilder buf = new StringBuilder();
String author = getAuthor(page);
- WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( null, null, page );
+ WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( page );
if( page.getVersion() > 1 )
{
String diff = m_engine.getDiff( ctx,
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java Sat Dec 20 03:42:31 2008
@@ -105,7 +105,7 @@
// Create a wiki context for the result
WikiEngine engine = m_wikiContext.getEngine();
- WikiContext context = engine.getWikiContextFactory().newViewContext( null, null, r.getPage() );
+ WikiContext context = engine.getWikiContextFactory().newViewContext( r.getPage() );
// Stash it in the page context
pageContext.setAttribute( WikiTagBase.ATTR_CONTEXT,
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java Sat Dec 20 03:42:31 2008
@@ -270,7 +270,7 @@
WikiPage entryPage = engine.createPage( WikiName.valueOf( pageName ) );
entryPage.setAuthor( username );
- WikiContext context = engine.getWikiContextFactory().newViewContext( null, null, entryPage );
+ WikiContext context = engine.getWikiContextFactory().newViewContext( entryPage );
StringBuilder text = new StringBuilder();
text.append( "!"+content.get("title") );
@@ -367,7 +367,7 @@
WikiPage entryPage = (WikiPage)page.clone();
entryPage.setAuthor( username );
- WikiContext context = engine.getWikiContextFactory().newViewContext( null, null, entryPage );
+ WikiContext context = engine.getWikiContextFactory().newViewContext( entryPage );
StringBuilder text = new StringBuilder();
text.append( "!"+content.get("title") );
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java Sat Dec 20 03:42:31 2008
@@ -267,7 +267,7 @@
LinkCollector extCollector = new LinkCollector();
LinkCollector attCollector = new LinkCollector();
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, page );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( page );
context.setVariable( WikiEngine.PROP_REFSTYLE, "absolute" );
m_engine.textToHTML( context,
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java Sat Dec 20 03:42:31 2008
@@ -219,7 +219,7 @@
LinkCollector extCollector = new LinkCollector();
LinkCollector attCollector = new LinkCollector();
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, page );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( page );
context.setVariable( WikiEngine.PROP_REFSTYLE, "absolute" );
m_engine.textToHTML( context,
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java Sat Dec 20 03:42:31 2008
@@ -52,8 +52,7 @@
m_variableManager = new VariableManager( props );
TestEngine testEngine = new TestEngine( props );
- m_context = testEngine.getWikiContextFactory().newViewContext( null, null,
- testEngine.createPage(WikiName.valueOf(PAGE_NAME)) );
+ m_context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage(WikiName.valueOf(PAGE_NAME)) );
}
catch( IOException e ) {}
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java Sat Dec 20 03:42:31 2008
@@ -914,7 +914,7 @@
Collection pages = m_engine.getReferenceManager().findReferrers( "RenameBugTestPage" );
assertEquals( "has one", "OldNameTestPage", pages.iterator().next() );
- WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( null, null, m_engine.getPage("OldNameTestPage") );
+ WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( m_engine.getPage("OldNameTestPage") );
m_engine.renamePage( ctx, "OldNameTestPage", "NewNameTestPage", true );
@@ -932,7 +932,7 @@
{
WikiPage p = m_engine.createPage( WikiName.valueOf( NAME1 ) );
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
context.getPage().setAttribute( WikiPage.CHANGENOTE, "Test change" );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java Sat Dec 20 03:42:31 2008
@@ -104,8 +104,7 @@
m_manager.storeAttachment( att, makeAttachmentFile() );
Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
- null, null,
- m_engine.createPage( WikiName.valueOf( NAME1 ) )),
+ m_engine.createPage( NAME1 )),
"test1.txt" );
assertNotNull( "attachment disappeared", att2 );
@@ -135,8 +134,7 @@
m_manager.storeAttachment( att, makeAttachmentFile() );
- Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
- null, null, m_engine.getPage( NAME1 )),
+ Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(m_engine.getPage( NAME1 )),
"test file.txt" );
assertNotNull( "attachment disappeared", att2 );
@@ -166,8 +164,7 @@
m_manager.storeAttachment( att, makeAttachmentFile() );
- Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
- null, null, m_engine.getPage(NAME1)),
+ Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(m_engine.getPage(NAME1)),
"test1.txt", 1 );
assertNotNull( "attachment disappeared", att2 );
@@ -201,8 +198,7 @@
att.setAuthor( "FooBar" );
m_manager.storeAttachment( att, makeAttachmentFile() );
- Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
- null, null, m_engine.getPage(NAME1)),
+ Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(m_engine.getPage(NAME1)),
"test1.txt" );
assertNotNull( "attachment disappeared", att2 );
@@ -227,8 +223,7 @@
// Check that first author did not disappear
//
- Attachment att3 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
- null, null, m_engine.getPage(NAME1)),
+ Attachment att3 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(m_engine.getPage(NAME1)),
"test1.txt",
1 );
assertEquals( "version of v1", 1, att3.getVersion() );
@@ -262,8 +257,7 @@
m_manager.storeAttachment( att, makeAttachmentFile() );
- Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
- null, null, m_engine.getPage( NAME1 )),
+ Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(m_engine.getPage( NAME1 )),
"test1" );
assertNotNull( "attachment disappeared", att2 );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java Sat Dec 20 03:42:31 2008
@@ -84,7 +84,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
m_engine.renamePage(context, "TestPage", "FooTest", false);
@@ -110,7 +110,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -135,7 +135,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -159,7 +159,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -183,7 +183,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -210,7 +210,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
m_engine.renamePage(context, "Test", "TestPage", true);
@@ -229,7 +229,7 @@
m_engine.addAttachment("TestPage", "bar.jpg", "pr0n".getBytes() );
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -307,7 +307,7 @@
{
WikiPage p = m_engine.getPage(src);
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( p );
m_engine.renamePage(context, src, dst, true);
}
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java Sat Dec 20 03:42:31 2008
@@ -202,8 +202,7 @@
props.load( TestEngine.findTestProperties() );
TestEngine engine = new TestEngine(props);
- WikiContext ctx = engine.getWikiContextFactory().newViewContext( null, null,
- engine.createPage( WikiName.valueOf( "Dummy" ) ) );
+ WikiContext ctx = engine.getWikiContextFactory().newViewContext( engine.createPage( "Dummy" ) );
String actualDiff = diff.makeDiffHtml( ctx, oldText, newText);
assertEquals(expectedDiff, actualDiff);
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java Sat Dec 20 03:42:31 2008
@@ -125,7 +125,7 @@
NoRequiredPropertyException,
ServletException
{
- WikiContext context = e.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = e.getWikiContextFactory().newViewContext( p );
JSPWikiMarkupParser tr = new JSPWikiMarkupParser( context,
new BufferedReader( new StringReader(src)) );
@@ -145,8 +145,7 @@
props.setProperty( "jspwiki.translatorReader.useRelNofollow", "true" );
TestEngine testEngine2 = new TestEngine( props );
- WikiContext context = testEngine2.getWikiContextFactory().newViewContext( null, null,
- testEngine2.createPage( WikiName.valueOf( PAGE_NAME ) ));
+ WikiContext context = testEngine2.getWikiContextFactory().newViewContext( testEngine2.createPage( PAGE_NAME ) );
JSPWikiMarkupParser r = new JSPWikiMarkupParser( context,
new BufferedReader( new StringReader(src)) );
@@ -2323,8 +2322,7 @@
{
LinkCollector coll = new LinkCollector();
String src = "[Test]";
- WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
- testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ) );
+ WikiContext context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage( PAGE_NAME ) );
MarkupParser p = new JSPWikiMarkupParser( context,
new BufferedReader( new StringReader(src)) );
@@ -2346,8 +2344,7 @@
LinkCollector coll = new LinkCollector();
String src = "["+PAGE_NAME+"/Test.txt]";
- WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
- testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ) );
+ WikiContext context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage( PAGE_NAME ) );
MarkupParser p = new JSPWikiMarkupParser( context,
new BufferedReader( new StringReader(src)) );
@@ -2380,8 +2377,7 @@
LinkCollector coll_others = new LinkCollector();
String src = "[TestAtt.txt]";
- WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
- testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ) );
+ WikiContext context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage( PAGE_NAME ) );
MarkupParser p = new JSPWikiMarkupParser( context,
new BufferedReader( new StringReader(src)) );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java Sat Dec 20 03:42:31 2008
@@ -68,8 +68,7 @@
NoRequiredPropertyException,
ServletException
{
- WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
- testEngine.createPage( WikiName.valueOf( "TestPage" ) ) );
+ WikiContext context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage( "TestPage" ) );
MarkupParser p = new JSPWikiMarkupParser( context, new StringReader(src) );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java Sat Dec 20 03:42:31 2008
@@ -58,8 +58,7 @@
props.load( TestEngine.findTestProperties() );
engine = new TestEngine(props);
- context = engine.getWikiContextFactory().newViewContext( null, null,
- engine.createPage( WikiName.valueOf( "Testpage" ) ) );
+ context = engine.getWikiContextFactory().newViewContext( engine.createPage( "Testpage" ) );
manager = new PluginManager( engine, props );
}
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java Sat Dec 20 03:42:31 2008
@@ -63,8 +63,7 @@
engine.saveText( "Foobar6", "Reference to [TestPage]." );
engine.saveText( "Foobar7", "Reference to [TestPage]." );
- context = engine.getWikiContextFactory().newViewContext( null, null,
- engine.createPage( WikiName.valueOf( "TestPage" ) ) );
+ context = engine.getWikiContextFactory().newViewContext( engine.createPage( "TestPage" ) );
manager = new PluginManager( engine, props );
}
@@ -93,8 +92,7 @@
public void testSingleReferral()
throws Exception
{
- WikiContext context2 = engine.getWikiContextFactory().newViewContext( null, null,
- engine.createPage( WikiName.valueOf( "Foobar" ) ) );
+ WikiContext context2 = engine.getWikiContextFactory().newViewContext( engine.createPage( "Foobar" ) );
String res = manager.execute( context2,
"{INSERT com.ecyrd.jspwiki.plugin.ReferringPagesPlugin WHERE max=5}");
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java Sat Dec 20 03:42:31 2008
@@ -221,7 +221,7 @@
{
WikiPage p = engine.createPage( NAME1 );
p.setAttribute(WikiPage.CHANGENOTE, "Test change" );
- WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
+ WikiContext context = engine.getWikiContextFactory().newViewContext(p);
engine.saveText( context, "test" );
@@ -234,7 +234,7 @@
throws Exception
{
WikiPage p = engine.createPage( NAME1 );
- WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
+ WikiContext context = engine.getWikiContextFactory().newViewContext(p);
context.getPage().setAttribute(WikiPage.CHANGENOTE, "Test change" );
engine.saveText( context, "test" );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java Sat Dec 20 03:42:31 2008
@@ -293,7 +293,7 @@
{
WikiPage p = engine.createPage( NAME1 );
p.setAttribute(WikiPage.CHANGENOTE, "Test change" );
- WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
+ WikiContext context = engine.getWikiContextFactory().newViewContext(p);
engine.saveText( context, "test" );
@@ -308,7 +308,7 @@
WikiPage p = engine.createPage( NAME1 );
- WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
+ WikiContext context = engine.getWikiContextFactory().newViewContext(p);
context.getPage().setAttribute(WikiPage.CHANGENOTE, "Test change" );
engine.saveText( context, "test" );
@@ -329,7 +329,7 @@
{
WikiPage p = engine.createPage( NAME1 );
- WikiContext context = engine.getWikiContextFactory().newViewContext( null, null, p );
+ WikiContext context = engine.getWikiContextFactory().newViewContext( p );
context.getPage().setAttribute( WikiPage.CHANGENOTE, "Test change" );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java Sat Dec 20 03:42:31 2008
@@ -49,7 +49,7 @@
private String render(String s) throws IOException
{
WikiPage dummyPage = m_testEngine.createPage("TestPage");
- WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( null, null, dummyPage );
+ WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( dummyPage );
StringReader in = new StringReader(s);
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java Sat Dec 20 03:42:31 2008
@@ -75,7 +75,7 @@
WikiPage page = m_engine.getPage( "TestPage" );
String pagedata = m_engine.getPureText( page );
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, page );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( page );
MarkupParser p = m_manager.getParser( context, pagedata );
@@ -98,7 +98,7 @@
WikiPage page = m_engine.getPage( "TestPage" );
String pagedata = m_engine.getPureText( page );
- WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, page );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( page );
String html = m_manager.getHTML( context, pagedata );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java Sat Dec 20 03:42:31 2008
@@ -58,7 +58,7 @@
private String render(String s) throws IOException
{
WikiPage dummyPage = m_testEngine.createPage("TestPage");
- WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( null, null, dummyPage );
+ WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( dummyPage );
StringReader in = new StringReader(s);
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java?rev=728273&r1=728272&r2=728273&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java Sat Dec 20 03:42:31 2008
@@ -82,7 +82,7 @@
RSSGenerator gen = m_testEngine.getRSSGenerator();
- WikiContext context = m_testEngine.getWikiContextFactory().newViewContext( null, null, m_testEngine.getPage("TestBlog") );
+ WikiContext context = m_testEngine.getWikiContextFactory().newViewContext( m_testEngine.getPage("TestBlog") );
WeblogPlugin blogplugin = new WeblogPlugin();
@@ -112,7 +112,7 @@
RSSGenerator gen = m_testEngine.getRSSGenerator();
- WikiContext context = m_testEngine.getWikiContextFactory().newViewContext( null, null, m_testEngine.getPage("TestBlog") );
+ WikiContext context = m_testEngine.getWikiContextFactory().newViewContext( m_testEngine.getPage("TestBlog") );
WeblogPlugin blogplugin = new WeblogPlugin();