Author: ajaquith
Date: Thu Feb 4 05:14:50 2010
New Revision: 906366
URL: http://svn.apache.org/viewvc?rev=906366&view=rev
Log:
[JSPWIKI-578] Eliminated the remaining top-level JSPs except for Error.jsp.
Minor tweaks to the templates/default directory; the layout JSP and related
JSPs are in their own layout/subdirectory.
Added:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SisterSitesActionBean.java
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/url/DefaultURLConstructor.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WorkflowActionBeanTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java
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=906366&r1=906365&r2=906366&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Thu Feb 4
05:14:50 2010
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "202";
+ public static final String BUILD = "203";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
Thu Feb 4 05:14:50 2010
@@ -58,7 +58,6 @@
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.parser.WikiDocument;
-import org.apache.wiki.plugin.WeblogEntryPlugin;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.preferences.Preferences.TimeFormat;
import org.apache.wiki.providers.ProviderException;
@@ -154,24 +153,6 @@
return new RedirectResolution( ViewActionBean.class ).addParameter(
"page", pagereq );
}
- /**
- * Event handler for new blog entries. The handler looks up the correct
- * blog page and redirects the user to it.
- * @return always returns a {...@link RedirectResolution} to the editing
- * page for the blog entry.
- */
- @HandlesEvent( "blog" )
- public Resolution blog() throws ProviderException
- {
- // Determine the correct page to redirect to
- WikiEngine engine = getContext().getEngine();
- WeblogEntryPlugin p = new WeblogEntryPlugin();
- String blogPage = p.getNewEntryPage( engine, getPage().getName() );
-
- // Redirect to the blog page for user to edit
- return new RedirectResolution( EditActionBean.class ).addParameter(
"page", blogPage );
- }
-
@HandlesEvent( "comment" )
@HandlerPermission( permissionClass = PagePermission.class, target =
"${page.path}", actions = PagePermission.COMMENT_ACTION )
@WikiRequestContext( "comment" )
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java
Thu Feb 4 05:14:50 2010
@@ -79,7 +79,7 @@
* details.
* </p>
*/
-...@urlbinding( "/Group.action" )
+...@urlbinding( "/Group.jsp" )
public class GroupActionBean extends AbstractActionBean
{
private static final String DEFAULT_NEW_GROUP_NAME = "MyGroup";
@@ -155,7 +155,7 @@
}
/**
- * Redirects the user to the <code>/EditGroup.jsp</code> display JSP.
+ * Redirects the user to the <code>/EditGroup.jsp</code> template JSP.
*
* @return {...@link net.sourceforge.stripes.action.ForwardResolution} to
the
* display JSP
@@ -166,7 +166,7 @@
public Resolution create()
{
String groupName = m_group == null ? DEFAULT_NEW_GROUP_NAME :
m_group.getName();
- RedirectResolution r = new RedirectResolution( "/EditGroup.jsp" );
+ ForwardResolution r = new ForwardResolution(
"/templates/default/EditGroup.jsp" );
r.addParameter( "group", groupName );
r.addParameter( "members",
getContext().getWikiSession().getUserPrincipal() );
return r;
@@ -210,7 +210,7 @@
@WikiRequestContext( "editGroup" )
public Resolution edit()
{
- return new ForwardResolution( "/EditGroup.jsp" ).addParameter(
"group", m_group.getName() );
+ return new ForwardResolution( "/templates/default/EditGroup.jsp"
).addParameter( "group", m_group.getName() );
}
public Group getGroup()
@@ -344,7 +344,7 @@
// User supplied a group, and it already exists
if( m_group != null && mgr.findRole( m_group.getName() ) != null )
{
- return new ForwardResolution( "/Group.jsp" );
+ return new ForwardResolution( "/templates/default/Group.jsp" );
}
// It is an error if we see LocalizableError with key
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
Thu Feb 4 05:14:50 2010
@@ -135,7 +135,7 @@
@WikiRequestContext( "message" )
public Resolution message()
{
- return new ForwardResolution( "/Message.jsp" );
+ return new ForwardResolution( "/templates/default/Message.jsp" );
}
/**
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java
Thu Feb 4 05:14:50 2010
@@ -21,23 +21,38 @@
package org.apache.wiki.action;
+import net.sourceforge.stripes.action.*;
+
+import org.apache.wiki.WikiEngine;
import org.apache.wiki.auth.permissions.WikiPermission;
+import org.apache.wiki.plugin.WeblogEntryPlugin;
+import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.ui.stripes.HandlerPermission;
import org.apache.wiki.ui.stripes.WikiRequestContext;
-import net.sourceforge.stripes.action.HandlesEvent;
-import net.sourceforge.stripes.action.Resolution;
-import net.sourceforge.stripes.action.UrlBinding;
-
-
-...@urlbinding("/NewBlogEntry.jsp")
-public class NewBlogEntryActionBean extends AbstractActionBean
+...@urlbinding( "/NewBlogEntry.jsp" )
+public class NewBlogEntryActionBean extends AbstractPageActionBean
{
- @HandlesEvent("create")
- @HandlerPermission(permissionClass=WikiPermission.class,
target="${engine.applicationName}", actions=WikiPermission.CREATE_PAGES_ACTION)
- @WikiRequestContext("newBlogEntry")
- public Resolution create()
+ /**
+ * Event handler for new blog entries. The handler looks up the correct
blog
+ * page and redirects the user to it.
+ *
+ * @return always returns a {...@link RedirectResolution} to the editing
page
+ * for the blog entry.
+ * @throws ProviderException if the page cannot be looked up
+ */
+ @DefaultHandler
+ @HandlesEvent( "blog" )
+ @HandlerPermission( permissionClass = WikiPermission.class, target =
"${engine.applicationName}", actions = WikiPermission.CREATE_PAGES_ACTION )
+ @WikiRequestContext( "newBlogEntry" )
+ public Resolution create() throws ProviderException
{
- return null;
+ // Determine the correct page to redirect to
+ WikiEngine engine = getContext().getEngine();
+ WeblogEntryPlugin p = new WeblogEntryPlugin();
+ String blogPage = p.getNewEntryPage( engine, getPage().getName() );
+
+ // Redirect to the blog page for user to edit
+ return new RedirectResolution( EditActionBean.class ).addParameter(
"page", blogPage );
}
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java
Thu Feb 4 05:14:50 2010
@@ -22,11 +22,9 @@
package org.apache.wiki.action;
import java.io.IOException;
-import java.security.Permission;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -38,11 +36,8 @@
import net.sourceforge.stripes.validation.Validate;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiSession;
import org.apache.wiki.api.WikiPage;
-import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.permissions.PagePermission;
-import org.apache.wiki.auth.permissions.PermissionFactory;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.rss.RSSGenerator;
@@ -51,11 +46,17 @@
import org.apache.wiki.ui.stripes.WikiRequestContext;
import org.apache.wiki.util.HttpUtil;
+/**
+ * Generates RSS feeds for WikiPages.
+ */
@UrlBinding( "/rss.jsp" )
public class RSSActionBean extends AbstractPageActionBean
{
- private static final Logger log = LoggerFactory.getLogger( "JSPWiki" );
-
+ private static final Logger log = LoggerFactory.getLogger(
RSSActionBean.class );
+
+ /**
+ * {...@inheritdoc} The {...@code page} attribute is required.
+ */
@Validate( required = true, on = "rss" )
public void setPage( WikiPage page )
{
@@ -63,9 +64,10 @@
}
/**
- * Generates a {...@link StreamingResolution} containing the RSS feed for
the current page.
- * If the feed is already cached and hasn't expired, it is returned.
Otherwise, a new
- * feed is generated.
+ * Generates a {...@link StreamingResolution} containing the RSS feed for
the
+ * current page. If the feed is already cached and hasn't expired, it is
+ * returned. Otherwise, a new feed is generated.
+ *
* @return the resolution
* @throws IOException if anything goes wrong
*/
@@ -196,46 +198,9 @@
}
/**
- * Generates a {...@link StreamingResolution} with the names and URLs of
all pages the
- * user as has access to, following the SisterSites standard. This event
- * method respects ACLs on pages.
- *
- * @see <a
href="http://usemod.com/cgi-bin/mb.pl?SisterSitesImplementationGuide";>Sister
- * Sites Implementation Guide</a>
- * @return the streaming resolution
- */
- @HandlesEvent( "sisterSites" )
- public Resolution sisterSites()
- {
- Resolution r = new StreamingResolution( "text/plain; charset=UTF-8" ) {
- @SuppressWarnings( "deprecation" )
- @Override
- protected void stream( HttpServletResponse response ) throws
Exception
- {
- WikiEngine engine = getContext().getEngine();
- AuthorizationManager mgr = engine.getAuthorizationManager();
- WikiSession session = getContext().getWikiSession();
- Set<String> allPages =
engine.getReferenceManager().findCreated();
- for( String page : allPages )
- {
- if( page.indexOf( "/" ) == -1 )
- {
- Permission permission =
PermissionFactory.getPagePermission( page, PagePermission.VIEW_ACTION );
- if( mgr.checkPermission( session, permission ) )
- {
- String url = engine.getViewURL( page );
- response.getWriter().write( url + " " + page +
"\n" );
- }
- }
- }
- }
- };
- return r;
- }
-
- /**
* Returns the RSS cache. If one does not exist, it will be initialized.
- * @return
+ *
+ * @return the cache
*/
private Cache getRssCache()
{
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java
Thu Feb 4 05:14:50 2010
@@ -72,7 +72,7 @@
* </p>
*
*/
-...@urlbinding( "/Rename.action" )
+...@urlbinding( "/Rename.jsp" )
public class RenameActionBean extends AbstractPageActionBean
{
private static final Logger log = LoggerFactory.getLogger(
RenameActionBean.class );
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java
Thu Feb 4 05:14:50 2010
@@ -58,6 +58,23 @@
private boolean m_details = false;
+ /**
+ * Enumeration of the search scope options.
+ */
+ public enum SearchScope
+ {
+ /** All page contents and attributes. */
+ ALL,
+ /** Author names only. */
+ AUTHORS,
+ /** Page names only. */
+ PAGE_NAMES,
+ /** Contents only. */
+ CONTENTS,
+ /** Attachment contents only. */
+ ATTACHMENTS
+ }
+
public boolean getDetails()
{
return m_details;
@@ -113,15 +130,6 @@
}
/**
- * Returns the number of items returned by the current search.
- * @return the number of items
- */
- public int getResultsCount()
- {
- return m_results.size();
- }
-
- /**
* Performs a search and returns the results as a list. For a given
WikiPage to
* be included in the results, the user must have permission to view it.
* If the underlying providers encounter an abnormal IOException or other
error,
@@ -194,7 +202,7 @@
public Resolution search()
{
m_results = m_query == null ? NO_RESULTS : doSearch( m_query );
- return new ForwardResolution( "/Search.jsp" );
+ return new ForwardResolution( "/templates/default/Search.jsp" );
}
/**
Added:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SisterSitesActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SisterSitesActionBean.java?rev=906366&view=auto
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SisterSitesActionBean.java
(added)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SisterSitesActionBean.java
Thu Feb 4 05:14:50 2010
@@ -0,0 +1,62 @@
+package org.apache.wiki.action;
+
+import java.security.Permission;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.stripes.action.*;
+
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.auth.AuthorizationManager;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.auth.permissions.PermissionFactory;
+
+/**
+ * Generates "sister sites" lists with the names and URLs of all pages the user
+ * as has access to, following the SisterSites standard.
+ */
+...@urlbinding( "/SisterSites.jsp" )
+public class SisterSitesActionBean extends AbstractActionBean
+{
+ /**
+ * Generates a {...@link StreamingResolution} with the names and URLs of
all
+ * pages the user as has access to, following the SisterSites standard.
This
+ * event method respects ACLs on pages.
+ *
+ * @see <a
href="http://usemod.com/cgi-bin/mb.pl?SisterSitesImplementationGuide";>
+ * Sister Sites Implementation Guide</a>
+ * @return the streaming resolution
+ */
+ @DefaultHandler
+ @DontBind
+ @HandlesEvent( "sisterSites" )
+ public Resolution sisterSites()
+ {
+ Resolution r = new StreamingResolution( "text/plain; charset=UTF-8" ) {
+ @SuppressWarnings( "deprecation" )
+ @Override
+ protected void stream( HttpServletResponse response ) throws
Exception
+ {
+ WikiEngine engine = getContext().getEngine();
+ AuthorizationManager mgr = engine.getAuthorizationManager();
+ WikiSession session = getContext().getWikiSession();
+ Set<String> allPages =
engine.getReferenceManager().findCreated();
+ for( String page : allPages )
+ {
+ if( page.indexOf( "/" ) == -1 )
+ {
+ Permission permission =
PermissionFactory.getPagePermission( page, PagePermission.VIEW_ACTION );
+ if( mgr.checkPermission( session, permission ) )
+ {
+ String url = engine.getViewURL( page );
+ response.getWriter().write( url + " " + page +
"\n" );
+ }
+ }
+ }
+ }
+ };
+ return r;
+ }
+}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java
Thu Feb 4 05:14:50 2010
@@ -36,6 +36,10 @@
import org.apache.wiki.workflow.Outcome;
import org.apache.wiki.workflow.Workflow;
+/**
+ * Displays and processes workflow events.
+ */
+...@urlbinding( "/Workflow.jsp" )
public class WorkflowActionBean extends AbstractActionBean
{
private Outcome m_outcome = null;
@@ -166,14 +170,14 @@
/**
* Event that the user to the preview display JSP.
*
- * @return always returns a forward resolution to the workflow page
{...@code
- * /Workflow.jsp}.
+ * @return always returns a forward resolution to the template JSP
+ * {...@code /Workflow.jsp}.
*/
@DefaultHandler
@HandlesEvent( "view" )
@WikiRequestContext( "workflow" )
public Resolution view()
{
- return new ForwardResolution( "/Workflow.jsp" );
+ return new ForwardResolution( "/templates/default/Workflow.jsp" );
}
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/url/DefaultURLConstructor.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/url/DefaultURLConstructor.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/url/DefaultURLConstructor.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/url/DefaultURLConstructor.java
Thu Feb 4 05:14:50 2010
@@ -83,7 +83,7 @@
c_urlPatterns.put( WikiContext.FIND, "%uSearch.jsp" );
c_urlPatterns.put( WikiContext.INSTALL, "%uadmin/Install.jsp" );
c_urlPatterns.put( WikiContext.LOGIN, "%uLogin.jsp?redirect=%n" );
- c_urlPatterns.put( WikiContext.LOGOUT, "%uLogout.jsp" );
+ c_urlPatterns.put( WikiContext.LOGOUT, "%uLogin.jsp?logout=" );
c_urlPatterns.put( WikiContext.MESSAGE, "%uMessage.jsp" );
c_urlPatterns.put( WikiContext.PREFS, "%uUserPreferences.jsp" );
c_urlPatterns.put( WikiContext.WORKFLOW, "%uWorkflow.jsp" );
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java
Thu Feb 4 05:14:50 2010
@@ -78,7 +78,7 @@
*/
private static final String[] DEFAULT_PROPERTIES =
{ "jspwiki.specialPage.Login", "Login.jsp",
- "jspwiki.specialPage.Logout", "Logout.jsp",
+ "jspwiki.specialPage.Logout", "Login.jsp?logout=",
"jspwiki.specialPage.CreateGroup", "NewGroup.jsp",
"jspwiki.specialPage.CreateProfile", "Register.jsp",
"jspwiki.specialPage.EditProfile", "UserPreferences.jsp",
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java
Thu Feb 4 05:14:50 2010
@@ -86,7 +86,7 @@
GroupActionBean bean = trip.getActionBean( GroupActionBean.class );
ValidationErrors errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Group.jsp", trip.getDestination() );
+ assertEquals( "/templates/default/Group.jsp", trip.getDestination() );
// Verify we got the right group
Group group = bean.getGroup();
@@ -115,7 +115,7 @@
bean = trip.getActionBean( GroupActionBean.class );
errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Group.action?create=&group=NonExistentGroup",
trip.getDestination() );
+ assertEquals( "/Group.jsp?create=&group=NonExistentGroup",
trip.getDestination() );
}
public void testViewNullGroup() throws Exception
@@ -136,7 +136,7 @@
assertEquals( 0, errors.size() );
assertNotNull( bean.getGroup() );
assertEquals( "Group1", bean.getGroup().getName() );
- assertEquals( "/Group.action?create=&group=Group1",
trip.getDestination() );
+ assertEquals( "/Group.jsp?create=&group=Group1", trip.getDestination()
);
}
public void testDeleteGroup() throws Exception
@@ -205,7 +205,7 @@
GroupActionBean bean = trip.getActionBean( GroupActionBean.class );
ValidationErrors errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Group.action?view=&group=TestSaveExistingGroup",
trip.getDestination() );
+ assertEquals( "/Group.jsp?view=&group=TestSaveExistingGroup",
trip.getDestination() );
// Verify the Group members were set on the Actionbean correctly
(sorted!)
List<Principal> members = bean.getMembers();
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WorkflowActionBeanTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WorkflowActionBeanTest.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WorkflowActionBeanTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WorkflowActionBeanTest.java
Thu Feb 4 05:14:50 2010
@@ -83,11 +83,11 @@
// View the workflows
trip.execute( "view" );
- // Verify we are directed to the view page
+ // Verify we are directed to the template page
WorkflowActionBean bean = trip.getActionBean( WorkflowActionBean.class
);
ValidationErrors errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Workflow.jsp", trip.getDestination() );
+ assertEquals( "/templates/default/Workflow.jsp", trip.getDestination()
);
// Verify that Admin owns 1 Workflow
List<Workflow> workflows = bean.getWorkflows();
@@ -144,7 +144,7 @@
// happen...
WorkflowActionBean bean = trip.getActionBean( WorkflowActionBean.class
);
assertEquals( 0, bean.getContext().getValidationErrors().size() );
- assertEquals( "/Workflow.action?view=", trip.getDestination() );
+ assertEquals( "/Workflow.jsp?view=", trip.getDestination() );
// Verify that the workflow is still running and was NOT aborted
WorkflowManager mgr = m_engine.getWorkflowManager();
@@ -199,7 +199,7 @@
// happen...
WorkflowActionBean bean = trip.getActionBean( WorkflowActionBean.class
);
assertEquals( 0, bean.getContext().getValidationErrors().size() );
- assertEquals( "/Workflow.action?view=", trip.getDestination() );
+ assertEquals( "/Workflow.jsp?view=", trip.getDestination() );
// Verify that the workflow is still running and was NOT completed
WorkflowManager mgr = m_engine.getWorkflowManager();
@@ -226,7 +226,7 @@
WorkflowActionBean bean = trip.getActionBean( WorkflowActionBean.class
);
ValidationErrors errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Workflow.action?view=", trip.getDestination() );
+ assertEquals( "/Workflow.jsp?view=", trip.getDestination() );
// Verify that Admin has no more current workflows
List<Workflow> workflows = bean.getWorkflows();
@@ -260,7 +260,7 @@
WorkflowActionBean bean = trip.getActionBean( WorkflowActionBean.class
);
ValidationErrors errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Workflow.action?view=", trip.getDestination() );
+ assertEquals( "/Workflow.jsp?view=", trip.getDestination() );
// Verify that Janne has no more current decisions
List<Decision> decisions = bean.getDecisions();
@@ -291,11 +291,11 @@
// View the workflows
trip.execute( "view" );
- // Verify we are directed to the view page
+ // Verify we are directed to the template page
WorkflowActionBean bean = trip.getActionBean( WorkflowActionBean.class
);
ValidationErrors errors = bean.getContext().getValidationErrors();
assertEquals( 0, errors.size() );
- assertEquals( "/Workflow.jsp", trip.getDestination() );
+ assertEquals( "/templates/default/Workflow.jsp", trip.getDestination()
);
// Verify that Janne does not own any Workflows
List<Workflow> workflows = bean.getWorkflows();
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java
Thu Feb 4 05:14:50 2010
@@ -132,7 +132,7 @@
// Set up a new GroupActionBean with the real group Admin and event
// "view"
- trip = m_engine.guestTrip( "/Group.action" );
+ trip = m_engine.guestTrip( "/Group.jsp" );
trip.getRequest().setMethod( "GET" );
trip.addParameter( "group", "Admin" );
trip.execute( "view" );
@@ -152,7 +152,7 @@
// Set up a new GroupActionBean with the real group Admin and event
// "save"
- trip = m_engine.guestTrip( "/Group.action" );
+ trip = m_engine.guestTrip( "/Group.jsp" );
trip.addParameter( "group", "Admin" );
trip.execute( "save" );
bean = trip.getActionBean( GroupActionBean.class );
@@ -170,7 +170,7 @@
// Set up a new GroupActionBean with the real group Admin and event
// "delete"
- trip = m_engine.guestTrip( "/Group.action" );
+ trip = m_engine.guestTrip( "/Group.jsp" );
trip.addParameter( "group", "Admin" );
trip.execute( "delete" );
bean = trip.getActionBean( GroupActionBean.class );
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java?rev=906366&r1=906365&r2=906366&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java
Thu Feb 4 05:14:50 2010
@@ -39,7 +39,7 @@
ResolverUtil.Test test = new IsOneOf( WikiActionBean.class,
PageFilter.class, WikiPlugin.class );
resolver.find( test, "org.apache.wiki" );
Set<Class<? extends Object>> matches = resolver.getClasses();
- assertEquals( 72, matches.size() );
+ assertEquals( 73, matches.size() );
}
public void testActionBeanMatches()
@@ -48,7 +48,7 @@
ResolverUtil.Test test = new IsOneOf( WikiActionBean.class );
resolver.find( test, "org.apache.wiki.action" );
Set<Class<? extends Object>> matches = resolver.getClasses();
- assertEquals( 25, matches.size() );
+ assertEquals( 26, matches.size() );
}
public void testPageFilterMatches()
