You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/11/25 06:06:28 UTC
svn commit: r720416 [2/2] - in
/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH:
src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/action/
src/com/ecyrd/jspwiki/auth/acl/ src/com/ecyrd/jspwiki/dav/items/
src/com/ecyrd/jspwiki/diff/ src/com/ecyrd/jspwi...
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java Mon Nov 24 21:06:19 2008
@@ -264,7 +264,7 @@
LinkCollector extCollector = new LinkCollector();
LinkCollector attCollector = new LinkCollector();
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, page );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, page );
context.setVariable( WikiEngine.PROP_REFSTYLE, "absolute" );
m_engine.textToHTML( context,
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java Mon Nov 24 21:06:19 2008
@@ -219,7 +219,7 @@
LinkCollector extCollector = new LinkCollector();
LinkCollector attCollector = new LinkCollector();
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, page );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, page );
context.setVariable( WikiEngine.PROP_REFSTYLE, "absolute" );
m_engine.textToHTML( context,
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/AbstractContext.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/AbstractContext.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/AbstractContext.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/AbstractContext.java Mon Nov 24 21:06:19 2008
@@ -115,22 +115,6 @@
*/
public HttpServletRequest getHttpRequest();
-
- /**
- * Returns the target of this wiki context: a page, group name or JSP. If
- * the associated Command is a PageCommand, this method returns the page's
- * name. Otherwise, this method delegates to the associated Command's
- * {@link com.ecyrd.jspwiki.ui.Command#getName()} method. Calling classes
- * can rely on the results of this method for looking up canonically-correct
- * page or group names. Because it does not automatically assume that the
- * wiki context is a PageCommand, calling this method is inherently safer
- * than calling <code>getPage().getName()</code>.
- * @return the name of the target of this wiki context
- * @see com.ecyrd.jspwiki.ui.PageCommand#getName()
- * @see com.ecyrd.jspwiki.ui.GroupCommand#getName()
- */
- public String getName();
-
/**
* Gets the template that is to be used throughout this request.
* @since 2.1.15.
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java Mon Nov 24 21:06:19 2008
@@ -324,7 +324,7 @@
// Create page and wiki context
WikiPage page = new WikiPage( this, pageName );
- WikiContext context = this.getWikiActionBeanFactory().newViewWikiContext( request, null, page );
+ WikiContext context = this.getWikiContextFactory().newViewContext( request, null, page );
saveText( context, content );
}
@@ -340,7 +340,7 @@
// Create page and wiki context
WikiPage page = new WikiPage( this, pageName );
- WikiContext context = this.getWikiActionBeanFactory().newViewWikiContext( request, null, page );
+ WikiContext context = this.getWikiContextFactory().newViewContext( request, null, page );
saveText( context, content );
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/VariableManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/VariableManagerTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/VariableManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/VariableManagerTest.java Mon Nov 24 21:06:19 2008
@@ -29,7 +29,7 @@
m_variableManager = new VariableManager( props );
TestEngine testEngine = new TestEngine( props );
- m_context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage( testEngine, PAGE_NAME ) );
+ m_context = testEngine.getWikiContextFactory().newViewContext( null, null, new WikiPage( testEngine, PAGE_NAME ) );
}
catch( IOException e ) {}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java Mon Nov 24 21:06:19 2008
@@ -889,7 +889,7 @@
Collection pages = m_engine.getReferenceManager().findReferrers( "RenameBugTestPage" );
assertEquals( "has one", "OldNameTestPage", pages.iterator().next() );
- WikiContext ctx = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, m_engine.getPage("OldNameTestPage") );
+ WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( null, null, m_engine.getPage("OldNameTestPage") );
m_engine.renamePage( ctx, "OldNameTestPage", "NewNameTestPage", true );
@@ -907,7 +907,7 @@
{
WikiPage p = new WikiPage( m_engine, NAME1 );
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
context.getPage().setAttribute( WikiPage.CHANGENOTE, "Test change" );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/AllTests.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/AllTests.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/AllTests.java Mon Nov 24 21:06:19 2008
@@ -21,7 +21,7 @@
suite.addTest( UserPreferencesActionBeanTest.suite() );
suite.addTest( UserProfileActionBeanTest.suite() );
suite.addTest( ViewActionBeanTest.suite() );
- suite.addTest( WikiActionBeanFactoryTest.suite() );
+ suite.addTest( WikiContextFactoryTest.suite() );
return suite;
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java Mon Nov 24 21:06:19 2008
@@ -63,7 +63,7 @@
errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
assertEquals( Users.JANNE, wikiSession.getLoginPrincipal().getName() );
- assertEquals( "/Wiki.jsp", trip.getDestination() );
+ assertEquals( "/Wiki.action", trip.getDestination() );
// Should be just one cookie (the JSPWiki asserted name cookie)
Cookie[] cookies = trip.getResponse().getCookies();
@@ -131,7 +131,7 @@
errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
assertEquals( Users.JANNE, wikiSession.getLoginPrincipal().getName() );
- assertEquals( "/Wiki.jsp?page=Foo", trip.getDestination() );
+ assertEquals( "/Wiki.action?page=Foo", trip.getDestination() );
}
public void testLoginRememberMe() throws Exception
@@ -157,7 +157,7 @@
errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
assertEquals( Users.JANNE, wikiSession.getLoginPrincipal().getName() );
- assertEquals( "/Wiki.jsp", trip.getDestination() );
+ assertEquals( "/Wiki.action", trip.getDestination() );
// Should be two cookies (the JSPWiki asserted name cookie plus the
// Remember Me? cookie)
@@ -185,7 +185,7 @@
errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
assertNotSame( Users.JANNE, wikiSession.getLoginPrincipal().getName() );
- assertEquals( "/Wiki.jsp", trip.getDestination() );
+ assertEquals( "/Wiki.action", trip.getDestination() );
// Should be just one cookie (the JSPWiki asserted name cookie), and it
// should be empty
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java Mon Nov 24 21:06:19 2008
@@ -107,7 +107,7 @@
trip.execute("rename");
errors = trip.getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Wiki.jsp?page=TestRenamed", trip.getDestination() );
+ assertEquals( "/Wiki.action?page=TestRenamed", trip.getDestination() );
assertFalse( m_engine.pageExists( "Test" ) );
assertTrue( m_engine.pageExists( "TestRenamed" ) );
@@ -137,7 +137,7 @@
trip.execute("rename");
errors = trip.getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Wiki.jsp?page=TestRenamed", trip.getDestination() );
+ assertEquals( "/Wiki.action?page=TestRenamed", trip.getDestination() );
assertFalse( m_engine.pageExists( "Test" ) );
assertTrue( m_engine.pageExists( "TestRenamed" ) );
referringText = m_engine.getPureText( m_engine.getPage("ReferstoTest") );
@@ -160,7 +160,7 @@
trip.execute("rename");
errors = trip.getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Wiki.jsp?page=TestRenamed", trip.getDestination() );
+ assertEquals( "/Wiki.action?page=TestRenamed", trip.getDestination() );
assertFalse( m_engine.pageExists( "Test" ) );
assertTrue( m_engine.pageExists( "TestRenamed" ) );
referringText = m_engine.getPureText( m_engine.getPage("ReferstoTest") );
@@ -183,7 +183,7 @@
trip.execute("rename");
errors = trip.getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Wiki.jsp?page=TestRenamed", trip.getDestination() );
+ assertEquals( "/Wiki.action?page=TestRenamed", trip.getDestination() );
assertFalse( m_engine.pageExists( "Test" ) );
assertTrue( m_engine.pageExists( "TestRenamed" ) );
referringText = m_engine.getPureText( m_engine.getPage("ReferstoTest") );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/UserProfileActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/UserProfileActionBeanTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/UserProfileActionBeanTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/UserProfileActionBeanTest.java Mon Nov 24 21:06:19 2008
@@ -63,7 +63,7 @@
assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
// Submit just the e-mail param
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.email", "fred@friendly.org" );
trip.execute( "save" );
bean = trip.getActionBean( UserProfileActionBean.class );
@@ -83,7 +83,7 @@
assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
// Submit just the full name param
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.fullname", "Fred Friendly" );
trip.execute( "save" );
bean = trip.getActionBean( UserProfileActionBean.class );
@@ -101,7 +101,7 @@
assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
// Submit just the login name param
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.loginName", "fred" );
trip.execute( "save" );
bean = trip.getActionBean( UserProfileActionBean.class );
@@ -119,7 +119,7 @@
assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
// Submit just the first password field
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.password", "myPassword" );
trip.execute( "save" );
bean = trip.getActionBean( UserProfileActionBean.class );
@@ -138,7 +138,7 @@
assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
// Submit just the second password field
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "passwordAgain", "myPassword" );
trip.execute( "save" );
bean = trip.getActionBean( UserProfileActionBean.class );
@@ -164,7 +164,7 @@
ValidationErrors errors;
// Set different passwords
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.loginName", "fred" );
trip.setParameter( "profile.fullname", "Fred Friendly" );
trip.setParameter( "profile.email", "fred@friendly.org" );
@@ -186,7 +186,7 @@
ValidationErrors errors;
// Set an illegal e-mail address
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.loginName", "fred" );
trip.setParameter( "profile.fullname", "Fred Friendly" );
trip.setParameter( "profile.email", "illegalEmail" );
@@ -212,7 +212,7 @@
assertFalse( userExists( "user" + suffix ) );
// Create new user
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.loginName", "user" + suffix );
trip.setParameter( "profile.fullname", "Fred Friendly" + suffix );
trip.setParameter( "profile.email", "fred@friendly.org" );
@@ -223,7 +223,7 @@
errors = bean.getContext().getValidationErrors();
// Check to make sure no validation errors here...
assertEquals( 0, errors.size() );
- assertEquals( "/Wiki.jsp", trip.getDestination() );
+ assertEquals( "/Wiki.action", trip.getDestination() );
// Verify user was saved
assertTrue( userExists( "user" + suffix ) );
@@ -247,7 +247,7 @@
// Create user #1; save; verify it saved ok
String suffix1 = String.valueOf( System.currentTimeMillis() );
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.loginName", "user" + suffix1 );
trip.setParameter( "profile.fullname", "Fred Friendly" + suffix1 );
trip.setParameter( "profile.email", "fred1@friendly.org" );
@@ -258,14 +258,14 @@
// Check to make sure no validation errors here...
errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Wiki.jsp", trip.getDestination() );
+ assertEquals( "/Wiki.action", trip.getDestination() );
assertTrue( userExists( "user" + suffix1 ) );
// Create user #2, but same loginName as #1; save; verify it did NOT
// save
// (because loginnames collided), and redirected back to .Action
String suffix2 = String.valueOf( System.currentTimeMillis() );
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.loginName", "user" + suffix1 );
trip.setParameter( "profile.fullname", "Fred Friendly" + suffix2 );
trip.setParameter( "profile.email", "fred2@friendly.org" );
@@ -282,7 +282,7 @@
// Create user #2, but same fullname as #1; save; verify it did NOT save
// (because fullnames collided), and redirected back to .Action
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.loginName", "user" + suffix2 );
trip.setParameter( "profile.fullname", "Fred Friendly" + suffix1 );
trip.setParameter( "profile.email", "fred2@friendly.org" );
@@ -309,7 +309,7 @@
// Create user; save; verify it saved ok
String suffix = String.valueOf( System.currentTimeMillis() );
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
trip.setParameter( "profile.loginName", "user" + suffix );
trip.setParameter( "profile.fullname", "Fred Friendly" + suffix );
trip.setParameter( "profile.email", "fred1@friendly.org" );
@@ -319,11 +319,11 @@
bean = trip.getActionBean( UserProfileActionBean.class );
errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Wiki.jsp", trip.getDestination() );
+ assertEquals( "/Wiki.action", trip.getDestination() );
assertTrue( userExists( "user" + suffix ) );
// Create new session and login as new user...
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
MockHttpServletRequest request = trip.getRequest();
WikiSession wikiSession = WikiSession.getWikiSession( m_engine, request );
boolean login = m_engine.getAuthenticationManager().login( wikiSession, "user" + suffix, "mypassword" );
@@ -337,7 +337,7 @@
assertEquals( "fred1@friendly.org", bean.getProfile().getEmail() );
// Now, create another session, and log in again....
- trip = m_engine.guestTrip( "/UserProfile.jsp" );
+ trip = m_engine.guestTrip( "/UserProfile.action" );
request = trip.getRequest();
wikiSession = WikiSession.getWikiSession( m_engine, request );
login = m_engine.getAuthenticationManager().login( wikiSession, "user" + suffix, "mypassword" );
Copied: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java (from r720116, incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiActionBeanFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java?p2=incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java&p1=incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiActionBeanFactoryTest.java&r1=720116&r2=720416&rev=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiActionBeanFactoryTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java Mon Nov 24 21:06:19 2008
@@ -17,10 +17,10 @@
import com.ecyrd.jspwiki.*;
-public class WikiActionBeanFactoryTest extends TestCase
+public class WikiContextFactoryTest extends TestCase
{
TestEngine m_engine;
- WikiActionBeanFactory resolver;
+ WikiContextFactory resolver;
protected void setUp() throws Exception
{
@@ -28,7 +28,7 @@
props.load( TestEngine.findTestProperties() );
props.put( WikiEngine.PROP_MATCHPLURALS, "yes" );
m_engine = new TestEngine( props );
- resolver = m_engine.getWikiActionBeanFactory();
+ resolver = m_engine.getWikiContextFactory();
m_engine.saveText( "SinglePage", "This is a test." );
m_engine.saveText( "PluralPages", "This is a test." );
}
@@ -46,7 +46,7 @@
MockHttpServletResponse response = trip.getResponse();
// Supplying an EditActionBean means the EDIT action
- context = resolver.newWikiContext( request, response, WikiContext.EDIT );
+ context = resolver.newContext( request, response, WikiContext.EDIT );
assertEquals( WikiContext.EDIT, context.getRequestContext() );
assertNull( context.getPage() );
@@ -69,11 +69,11 @@
}
// Supplying the PrefsActionBean means the PREFS context
- context = resolver.newWikiContext( request, response, WikiContext.PREFS );
+ context = resolver.newContext( request, response, WikiContext.PREFS );
assertEquals( WikiContext.PREFS, context.getRequestContext() );
// Supplying the GroupActionBean means the VIEW_GROUP context
- context = resolver.newWikiContext( request, response, WikiContext.VIEW_GROUP );
+ context = resolver.newContext( request, response, WikiContext.VIEW_GROUP );
assertEquals( WikiContext.VIEW_GROUP, context.getRequestContext() );
}
@@ -88,14 +88,14 @@
// Request for "UserPreference.jsp" should resolve to PREFS action
request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/UserPreferences.jsp");
request.setSession( session );
- context = resolver.newWikiContext( request, response, WikiContext.PREFS );
+ context = resolver.newContext( request, response, WikiContext.PREFS );
assertEquals( WikiContext.PREFS, context.getRequestContext() );
// We don't care about JSPs not mapped to actions, because the bean we get only depends on the class we pass
// FIXME: this won't work because WikiActionBeanResolver doesn't keep a cache of URLBindings
request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/NonExistent.jsp");
request.setSession( session );
- context = resolver.newWikiContext( request, response, WikiContext.EDIT );
+ context = resolver.newContext( request, response, WikiContext.EDIT );
assertEquals( WikiContext.EDIT, context.getRequestContext() );
assertNull( context.getPage() );
}
@@ -113,7 +113,7 @@
request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/Edit.jsp");
request.setSession( session );
request.getParameterMap().put( "page", new String[]{"SinglePage"} );
- context = resolver.newWikiContext( request, response, WikiContext.EDIT );
+ context = resolver.newContext( request, response, WikiContext.EDIT );
assertEquals( WikiContext.EDIT, context.getRequestContext() );
assertEquals( page, context.getPage());
@@ -122,14 +122,14 @@
request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/Wiki.jsp");
request.setSession( session );
request.getParameterMap().put( "page", new String[]{"FindPage"} );
- context = resolver.newWikiContext( request, response, WikiContext.VIEW );
+ context = resolver.newContext( request, response, WikiContext.VIEW );
assertEquals( WikiContext.VIEW, context.getRequestContext() );
// Passing a VIEW_GROUP request with group="Art" gets a ViewGroupActionBean
request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/Wiki.jsp");
request.setSession( session );
request.getParameterMap().put( "group", new String[]{"Art"} );
- context = resolver.newWikiContext( request, response, WikiContext.VIEW_GROUP );
+ context = resolver.newContext( request, response, WikiContext.VIEW_GROUP );
assertEquals( WikiContext.VIEW_GROUP, context.getRequestContext() );
}
@@ -166,6 +166,6 @@
public static Test suite()
{
- return new TestSuite( WikiActionBeanFactoryTest.class );
+ return new TestSuite( WikiContextFactoryTest.class );
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java Mon Nov 24 21:06:19 2008
@@ -83,7 +83,7 @@
m_manager.storeAttachment( att, makeAttachmentFile() );
- Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext(
+ Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
null, null, new WikiPage(m_engine, NAME1)),
"test1.txt" );
@@ -114,7 +114,7 @@
m_manager.storeAttachment( att, makeAttachmentFile() );
- Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext(
+ Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
null, null, new WikiPage(m_engine, NAME1)),
"test file.txt" );
@@ -145,7 +145,7 @@
m_manager.storeAttachment( att, makeAttachmentFile() );
- Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext(
+ Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
null, null, new WikiPage(m_engine, NAME1)),
"test1.txt", 1 );
@@ -180,7 +180,7 @@
att.setAuthor( "FooBar" );
m_manager.storeAttachment( att, makeAttachmentFile() );
- Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext(
+ Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
null, null, new WikiPage(m_engine, NAME1)),
"test1.txt" );
@@ -206,7 +206,7 @@
// Check that first author did not disappear
//
- Attachment att3 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext(
+ Attachment att3 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
null, null, new WikiPage(m_engine, NAME1)),
"test1.txt",
1 );
@@ -241,7 +241,7 @@
m_manager.storeAttachment( att, makeAttachmentFile() );
- Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext(
+ Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
null, null, new WikiPage(m_engine, NAME1)),
"test1" );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java Mon Nov 24 21:06:19 2008
@@ -62,7 +62,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
m_engine.renamePage(context, "TestPage", "FooTest", false);
@@ -88,7 +88,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext(null, null, p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -113,7 +113,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -137,7 +137,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -161,7 +161,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -188,7 +188,7 @@
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
m_engine.renamePage(context, "Test", "TestPage", true);
@@ -207,7 +207,7 @@
m_engine.addAttachment("TestPage", "bar.jpg", "pr0n".getBytes() );
WikiPage p = m_engine.getPage("TestPage");
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
m_engine.renamePage(context, "TestPage", "FooTest", true);
@@ -285,7 +285,7 @@
{
WikiPage p = m_engine.getPage(src);
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, p );
m_engine.renamePage(context, src, dst, true);
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java Mon Nov 24 21:06:19 2008
@@ -182,7 +182,7 @@
PropertyConfigurator.configure(props);
TestEngine engine = new TestEngine(props);
- WikiContext ctx = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine,"Dummy") );
+ WikiContext ctx = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine,"Dummy") );
String actualDiff = diff.makeDiffHtml( ctx, oldText, newText);
assertEquals(expectedDiff, actualDiff);
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java Mon Nov 24 21:06:19 2008
@@ -101,7 +101,7 @@
NoRequiredPropertyException,
ServletException
{
- WikiContext context = e.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = e.getWikiContextFactory().newViewContext( null, null, p );
JSPWikiMarkupParser tr = new JSPWikiMarkupParser( context,
new BufferedReader( new StringReader(src)) );
@@ -121,7 +121,7 @@
props.setProperty( "jspwiki.translatorReader.useRelNofollow", "true" );
TestEngine testEngine2 = new TestEngine( props );
- WikiContext context = testEngine2.getWikiActionBeanFactory().newViewWikiContext( null, null,
+ WikiContext context = testEngine2.getWikiContextFactory().newViewContext( null, null,
new WikiPage(testEngine2, PAGE_NAME) );
JSPWikiMarkupParser r = new JSPWikiMarkupParser( context,
new BufferedReader( new StringReader(src)) );
@@ -2299,7 +2299,7 @@
{
LinkCollector coll = new LinkCollector();
String src = "[Test]";
- WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null,
+ WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
new WikiPage(testEngine,PAGE_NAME) );
MarkupParser p = new JSPWikiMarkupParser( context,
@@ -2322,7 +2322,7 @@
LinkCollector coll = new LinkCollector();
String src = "["+PAGE_NAME+"/Test.txt]";
- WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null,
+ WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
new WikiPage(testEngine,PAGE_NAME) );
MarkupParser p = new JSPWikiMarkupParser( context,
@@ -2356,7 +2356,7 @@
LinkCollector coll_others = new LinkCollector();
String src = "[TestAtt.txt]";
- WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null,
+ WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
new WikiPage(testEngine,PAGE_NAME) );
MarkupParser p = new JSPWikiMarkupParser( context,
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java Mon Nov 24 21:06:19 2008
@@ -48,7 +48,7 @@
NoRequiredPropertyException,
ServletException
{
- WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null,
+ WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
new WikiPage(testEngine, "TestPage") );
MarkupParser p = new JSPWikiMarkupParser( context, new StringReader(src) );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java Mon Nov 24 21:06:19 2008
@@ -38,7 +38,7 @@
props.load( TestEngine.findTestProperties() );
engine = new TestEngine(props);
- context = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "Testpage") );
+ context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine, "Testpage") );
manager = new PluginManager( engine, props );
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java Mon Nov 24 21:06:19 2008
@@ -41,7 +41,7 @@
engine.saveText( "Foobar6", "Reference to [TestPage]." );
engine.saveText( "Foobar7", "Reference to [TestPage]." );
- context = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine,"TestPage") );
+ context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine,"TestPage") );
manager = new PluginManager( engine, props );
}
@@ -70,7 +70,7 @@
public void testSingleReferral()
throws Exception
{
- WikiContext context2 = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "Foobar") );
+ WikiContext context2 = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine, "Foobar") );
String res = manager.execute( context2,
"{INSERT com.ecyrd.jspwiki.plugin.ReferringPagesPlugin WHERE max=5}");
@@ -111,7 +111,7 @@
public void testReferenceWidth()
throws Exception
{
- WikiContext context2 = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "Foobar") );
+ WikiContext context2 = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine, "Foobar") );
String res = manager.execute( context2,
"{INSERT com.ecyrd.jspwiki.plugin.ReferringPagesPlugin WHERE maxwidth=5}");
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java Mon Nov 24 21:06:19 2008
@@ -33,7 +33,7 @@
engine.saveText( "TestPage", "Reference to [Foobar]." );
engine.saveText( "Foobar", "Reference to [Foobar 2], [Foobars]" );
- context = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "TestPage") );
+ context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine, "TestPage") );
manager = new PluginManager( engine, props );
}
@@ -57,7 +57,7 @@
public void testSimpleUndefined()
throws Exception
{
- WikiContext context2 = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "Foobar") );
+ WikiContext context2 = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine, "Foobar") );
String res = manager.execute( context2,
"{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin");
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java Mon Nov 24 21:06:19 2008
@@ -200,7 +200,7 @@
{
WikiPage p = new WikiPage( engine, NAME1 );
p.setAttribute(WikiPage.CHANGENOTE, "Test change" );
- WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p);
+ WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
engine.saveText( context, "test" );
@@ -213,7 +213,7 @@
throws Exception
{
WikiPage p = new WikiPage( engine, NAME1 );
- WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p);
+ WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
context.getPage().setAttribute(WikiPage.CHANGENOTE, "Test change" );
engine.saveText( context, "test" );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java Mon Nov 24 21:06:19 2008
@@ -272,7 +272,7 @@
{
WikiPage p = new WikiPage( engine, NAME1 );
p.setAttribute(WikiPage.CHANGENOTE, "Test change" );
- WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p);
+ WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
engine.saveText( context, "test" );
@@ -287,7 +287,7 @@
WikiPage p = new WikiPage( engine, NAME1 );
- WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p);
+ WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
context.getPage().setAttribute(WikiPage.CHANGENOTE, "Test change" );
engine.saveText( context, "test" );
@@ -308,7 +308,7 @@
{
WikiPage p = new WikiPage( engine, NAME1 );
- WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p );
+ WikiContext context = engine.getWikiContextFactory().newViewContext( null, null, p );
context.getPage().setAttribute( WikiPage.CHANGENOTE, "Test change" );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java Mon Nov 24 21:06:19 2008
@@ -29,7 +29,7 @@
private String render(String s) throws IOException
{
WikiPage dummyPage = new WikiPage(m_testEngine,"TestPage");
- WikiContext ctx = m_testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, dummyPage );
+ WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( null, null, dummyPage );
StringReader in = new StringReader(s);
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java Mon Nov 24 21:06:19 2008
@@ -55,7 +55,7 @@
WikiPage page = m_engine.getPage( "TestPage" );
String pagedata = m_engine.getPureText( page );
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, page );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, page );
MarkupParser p = m_manager.getParser( context, pagedata );
@@ -78,7 +78,7 @@
WikiPage page = m_engine.getPage( "TestPage" );
String pagedata = m_engine.getPureText( page );
- WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, page );
+ WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, page );
String html = m_manager.getHTML( context, pagedata );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java Mon Nov 24 21:06:19 2008
@@ -38,7 +38,7 @@
private String render(String s) throws IOException
{
WikiPage dummyPage = new WikiPage(m_testEngine,"TestPage");
- WikiContext ctx = m_testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, dummyPage );
+ WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( null, null, dummyPage );
StringReader in = new StringReader(s);
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java Mon Nov 24 21:06:19 2008
@@ -62,7 +62,7 @@
RSSGenerator gen = m_testEngine.getRSSGenerator();
- WikiContext context = m_testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, m_testEngine.getPage("TestBlog") );
+ WikiContext context = m_testEngine.getWikiContextFactory().newViewContext( null, null, m_testEngine.getPage("TestBlog") );
WeblogPlugin blogplugin = new WeblogPlugin();
@@ -92,7 +92,7 @@
RSSGenerator gen = m_testEngine.getRSSGenerator();
- WikiContext context = m_testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, m_testEngine.getPage("TestBlog") );
+ WikiContext context = m_testEngine.getWikiContextFactory().newViewContext( null, null, m_testEngine.getPage("TestBlog") );
WeblogPlugin blogplugin = new WeblogPlugin();
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java Mon Nov 24 21:06:19 2008
@@ -28,7 +28,7 @@
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
testEngine = new TestEngine( props );
- WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(testEngine,"dummyPage") );
+ WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null, new WikiPage(testEngine,"dummyPage") );
val = new InputValidator( TEST, context );
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/stripes/StripesJspTransformer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/stripes/StripesJspTransformer.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/stripes/StripesJspTransformer.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/stripes/StripesJspTransformer.java Mon Nov 24 21:06:19 2008
@@ -10,7 +10,7 @@
import net.sourceforge.stripes.action.UrlBinding;
import net.sourceforge.stripes.util.ResolverUtil;
-import com.ecyrd.jspwiki.action.WikiActionBeanFactory;
+import com.ecyrd.jspwiki.action.WikiContextFactory;
/**
* Transforms a JspDocument from standard JSP markup to Stripes markup.
@@ -27,8 +27,8 @@
public void initialize( Map<String, Object> sharedState )
{
// Find all ActionBean implementations on the classpath
- String beanPackagesProp = System.getProperty( WikiActionBeanFactory.PROPS_ACTIONBEAN_PACKAGES,
- WikiActionBeanFactory.DEFAULT_ACTIONBEAN_PACKAGES ).trim();
+ String beanPackagesProp = System.getProperty( WikiContextFactory.PROPS_ACTIONBEAN_PACKAGES,
+ WikiContextFactory.DEFAULT_ACTIONBEAN_PACKAGES ).trim();
String[] beanPackages = beanPackagesProp.split( "," );
ResolverUtil<ActionBean> resolver = new ResolverUtil<ActionBean>();
resolver.findImplementations( ActionBean.class, beanPackages );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java Mon Nov 24 21:06:19 2008
@@ -55,7 +55,7 @@
TestEngine testEngine = new TestEngine( m_props );
- m_context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage( testEngine, PAGE_NAME ) );
+ m_context = testEngine.getWikiContextFactory().newViewContext( null, null, new WikiPage( testEngine, PAGE_NAME ) );
}
public void tearDown()
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java?rev=720416&r1=720415&r2=720416&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java Mon Nov 24 21:06:19 2008
@@ -30,7 +30,7 @@
m_engine = new TestEngine( m_props );
m_handler = new RPCHandler();
- WikiContext ctx = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(m_engine, "Dummy") );
+ WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(m_engine, "Dummy") );
m_handler.initialize( ctx );
}