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 2009/06/08 03:46:00 UTC
svn commit: r782500 - in /incubator/jspwiki/trunk/src/WebContent: ./ admin/
templates/default/ templates/default/admin/ templates/default/editors/
Author: ajaquith
Date: Mon Jun 8 01:45:59 2009
New Revision: 782500
URL: http://svn.apache.org/viewvc?rev=782500&view=rev
Log:
Changed all instances of the stripes: prefix in the JSPs to s:.
Modified:
incubator/jspwiki/trunk/src/WebContent/Captcha.jsp
incubator/jspwiki/trunk/src/WebContent/CookieError.jsp
incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp
incubator/jspwiki/trunk/src/WebContent/Diff.jsp
incubator/jspwiki/trunk/src/WebContent/Error.jsp
incubator/jspwiki/trunk/src/WebContent/Install.jsp
incubator/jspwiki/trunk/src/WebContent/Logout.jsp
incubator/jspwiki/trunk/src/WebContent/Message.jsp
incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp
incubator/jspwiki/trunk/src/WebContent/PageModified.jsp
incubator/jspwiki/trunk/src/WebContent/admin/SecurityConfig.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXCategories.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXPreview.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroupContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Footer.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/GroupContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/GroupTab.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Header.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/LoginContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/LostPasswordContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/NewGroupContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsTop.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/WorkflowContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/AdminTemplate.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/UserManagement.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp
Modified: incubator/jspwiki/trunk/src/WebContent/Captcha.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Captcha.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Captcha.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Captcha.jsp Mon Jun 8 01:45:59 2009
@@ -30,10 +30,8 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
-
-
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
Modified: incubator/jspwiki/trunk/src/WebContent/CookieError.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/CookieError.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/CookieError.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/CookieError.jsp Mon Jun 8 01:45:59 2009
@@ -20,9 +20,8 @@
--%>
<%@ page import="org.apache.wiki.*" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
-
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context; authorization check not needed
Modified: incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp Mon Jun 8 01:45:59 2009
@@ -18,5 +18,5 @@
specific language governing permissions and limitations
under the License.
--%>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.GroupActionBean" event="delete" id="wikiActionBean" executeResolution="true" />
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.GroupActionBean" event="delete" id="wikiActionBean" executeResolution="true" />
Modified: incubator/jspwiki/trunk/src/WebContent/Diff.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Diff.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Diff.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Diff.jsp Mon Jun 8 01:45:59 2009
@@ -26,8 +26,8 @@
<%@ page import="org.apache.wiki.api.WikiPage" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="diff" id="wikiActionBean" />
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="diff" id="wikiActionBean" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
Modified: incubator/jspwiki/trunk/src/WebContent/Error.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Error.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Error.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Error.jsp Mon Jun 8 01:45:59 2009
@@ -24,12 +24,12 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.action.*" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="org.apache.wiki.util.FileUtil" %>
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
-<stripes:useActionBean beanclass="org.apache.wiki.action.ErrorActionBean" id="wikiActionBean" />
+<s:useActionBean beanclass="org.apache.wiki.action.ErrorActionBean" id="wikiActionBean" />
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
WikiContext wikiContext = WikiContextFactory.findContext( pageContext );
Modified: incubator/jspwiki/trunk/src/WebContent/Install.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Install.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Install.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Install.jsp Mon Jun 8 01:45:59 2009
@@ -18,7 +18,6 @@
specific language governing permissions and limitations
under the License.
--%>
-<?xml version="1.0" encoding="UTF-8"?>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.AuthenticationManager" %>
@@ -28,8 +27,8 @@
<%@ page import="java.util.ResourceBundle" %>
<%@ page import="java.text.MessageFormat" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.InstallActionBean" event="install" id="wikiActionBean" />
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.InstallActionBean" event="install" id="wikiActionBean" />
<%!
Modified: incubator/jspwiki/trunk/src/WebContent/Logout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Logout.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Logout.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Logout.jsp Mon Jun 8 01:45:59 2009
@@ -18,4 +18,5 @@
specific language governing permissions and limitations
under the License.
--%>
-<stripes:useActionBean beanclass="org.apache.wiki.action.LoginActionBean" event="logout" executeResolution="true" id="wikiActionBean" />
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.LoginActionBean" event="logout" executeResolution="true" id="wikiActionBean" />
Modified: incubator/jspwiki/trunk/src/WebContent/Message.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Message.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Message.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Message.jsp Mon Jun 8 01:45:59 2009
@@ -26,11 +26,11 @@
<%@ page import="org.apache.wiki.ui.stripes.*" %>
<%@ page import="org.apache.wiki.tags.WikiTagBase" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
-<stripes:useActionBean beanclass="org.apache.wiki.action.MessageActionBean" id="wikiActionBean" />
+<s:useActionBean beanclass="org.apache.wiki.action.MessageActionBean" id="wikiActionBean" />
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
WikiContext wikiContext = WikiContextFactory.findContext( pageContext );
Modified: incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp Mon Jun 8 01:45:59 2009
@@ -25,8 +25,8 @@
<%@ page import="org.apache.wiki.plugin.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="edit" id="wikiActionBean" />
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="edit" id="wikiActionBean" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
Modified: incubator/jspwiki/trunk/src/WebContent/PageModified.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/PageModified.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/PageModified.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/PageModified.jsp Mon Jun 8 01:45:59 2009
@@ -25,9 +25,9 @@
<%@ page import="org.apache.wiki.ui.EditorManager" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.PageModifiedActionBean" event="conflict" id="wikiActionBean" />
+<s:useActionBean beanclass="org.apache.wiki.action.PageModifiedActionBean" event="conflict" id="wikiActionBean" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
Modified: incubator/jspwiki/trunk/src/WebContent/admin/SecurityConfig.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/admin/SecurityConfig.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/admin/SecurityConfig.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/admin/SecurityConfig.jsp Mon Jun 8 01:45:59 2009
@@ -25,9 +25,9 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.NoneActionBean" event="none" id="wikiActionBean" />
+<s:useActionBean beanclass="org.apache.wiki.action.NoneActionBean" event="none" id="wikiActionBean" />
<%!
public void jspInit()
{
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXCategories.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXCategories.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXCategories.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXCategories.jsp Mon Jun 8 01:45:59 2009
@@ -20,8 +20,8 @@
--%>
<%@ page import="org.apache.wiki.*" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
<%!
public void jspInit()
{
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXPreview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXPreview.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXPreview.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXPreview.jsp Mon Jun 8 01:45:59 2009
@@ -26,8 +26,8 @@
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.permissions.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
<%!
public void jspInit()
{
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroupContent.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroupContent.jsp Mon Jun 8 01:45:59 2009
@@ -29,7 +29,7 @@
<%@ page import="org.apache.wiki.log.LoggerFactory" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%!
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Footer.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Footer.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Footer.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Footer.jsp Mon Jun 8 01:45:59 2009
@@ -21,13 +21,13 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="org.apache.wiki.*" %>
<div id="footer">
<div class="applicationlogo" >
<c:set var="frontPageTitle"><fmt:message key='actions.home.title' ><fmt:param><c:out value='${wikiEngine.frontPage}' /></fmt:param></fmt:message></c:set>
- <stripes:link beanclass="org.apache.wiki.action.ViewActionBean" title="${frontPageTitle}"><fmt:message key="actions.home" /></stripes:link>
+ <s:link beanclass="org.apache.wiki.action.ViewActionBean" title="${frontPageTitle}"><fmt:message key="actions.home" /></s:link>
</div>
<div class="companylogo"></div>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/GroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/GroupContent.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/GroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/GroupContent.jsp Mon Jun 8 01:45:59 2009
@@ -21,19 +21,19 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<wiki:TabbedSection defaultTab="${param.tab}">
<wiki:Tab id="viewgroup" titleKey="group.tab">
<h3><c:out value="${wikiActionBean.name}" /></h3>
- <strips:messages />
+ <s:messages />
<wiki:Permission permission="createGroups">
<fmt:message key="group.createsuggestion">
<fmt:param>
- <stripes:link beanclass="org.apache.wiki.action.GroupActionBean" event="create">
- <stripes:param name="group" value="${wikiActionBean.name}" />
- <stripes:param name="group" value="${wikiActionBean.name}" />
+ <s:link beanclass="org.apache.wiki.action.GroupActionBean" event="create">
+ <s:param name="group" value="${wikiActionBean.name}" />
+ <s:param name="group" value="${wikiActionBean.name}" />
<fmt:message key="group.createit" />
- </stripes:link>
+ </s:link>
</fmt:param>
</fmt:message>
</wiki:Permission>
@@ -78,19 +78,19 @@
<wiki:Permission permission="deleteGroup">
<c:set var="confirm" value="<fmt:message key='grp.deletegroup.confirm'/>" scope="page"/>
- <stripes:form beanclass="org.apache.wiki.action.GroupActionBean" class="wikiform"
+ <s:form beanclass="org.apache.wiki.action.GroupActionBean" class="wikiform"
id="deleteGroup"
onsubmit="return( confirm('${confirm}') && Wiki.submitOnce(this) );"
method="POST" acceptcharset="UTF-8">
- <stripes:submit name="delete"><fmt:message key="actions.deletegroup" /></stripes:submit>
- </stripes:form>
+ <s:submit name="delete"><fmt:message key="actions.deletegroup" /></s:submit>
+ </s:form>
</wiki:Permission>
</wiki:Tab>
<wiki:Permission permission="editGroup">
<wiki:Tab id="editgroup" titleKey="actions.editgroup"
- url="<stripes:link beanclass='org.apache.wiki.action.GroupActionBean' event='edit'><stripes:param name='group' value='${wikiActionBean.name}' /></stripes:link>"
+ url="<s:link beanclass='org.apache.wiki.action.GroupActionBean' event='edit'><s:param name='group' value='${wikiActionBean.name}' /></s:link>"
accesskey="e" >
</wiki:Tab>
</wiki:Permission>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/GroupTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/GroupTab.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/GroupTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/GroupTab.jsp Mon Jun 8 01:45:59 2009
@@ -33,7 +33,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
<%!
String printWikiGroupPutGroup( Group group, String name, boolean cursor, PageContext pageContext)
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Header.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Header.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Header.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Header.jsp Mon Jun 8 01:45:59 2009
@@ -21,14 +21,14 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<div id="header">
<div class="titlebox"><wiki:InsertPage page="TitleBox" /></div>
<div class="applicationlogo" >
<c:set var="frontPageTitle"><fmt:message key='actions.home.title' ><fmt:param><c:out value='${wikiEngine.frontPage}' /></fmt:param></fmt:message></c:set>
- <stripes:link beanclass="org.apache.wiki.action.ViewActionBean" title="${frontPageTitle}"><fmt:message key="actions.home" /></stripes:link>
+ <s:link beanclass="org.apache.wiki.action.ViewActionBean" title="${frontPageTitle}"><fmt:message key="actions.home" /></s:link>
</div>
<div class="companylogo"></div>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/LoginContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/LoginContent.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/LoginContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/LoginContent.jsp Mon Jun 8 01:45:59 2009
@@ -24,7 +24,7 @@
<%@ page import="org.apache.wiki.auth.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%
String postURL = "";
@@ -49,8 +49,8 @@
<wiki:Tab id="logincontent" titleKey="login.tab">
<%--<wiki:Include page='LoginTab.jsp'/>--%>
-<stripes:form action="<%=postURL%>" id="login" class="wikiform" method="post" acceptcharset="UTF-8">
- <stripes:param name="tab" value="logincontent" />
+<s:form action="<%=postURL%>" id="login" class="wikiform" acceptcharset="UTF-8">
+ <s:param name="tab" value="logincontent" />
<div class="center">
@@ -65,25 +65,25 @@
</td>
</tr>
<tr>
- <td><stripes:label for="j_username" name="loginName" /></td>
+ <td><s:label for="j_username" name="loginName" /></td>
<td>
- <stripes:text size="24" name="j_username" id="j_username"><wiki:Variable var="uid" default="" /></stripes:text>
+ <s:text size="24" name="j_username" id="j_username"><wiki:Variable var="uid" default="" /></s:text>
</td>
</tr>
<tr>
- <td><stripes:label for="j_password" name="password" /></td>
- <td><stripes:password size="24" name="j_password" id="j_password" /></td>
+ <td><s:label for="j_password" name="password" /></td>
+ <td><s:password size="24" name="j_password" id="j_password" /></td>
</tr>
<% if( supportsCookieAuthentication ) { %>
<tr>
- <td><stripes:label for="remember" /></td>
- <td><stripes:checkbox name="remember" id="j_remember" /></td>
+ <td><s:label for="remember" /></td>
+ <td><s:checkbox name="remember" id="j_remember" /></td>
</tr>
<% } %>
<tr>
<td> </td>
<td>
- <stripes:submit name="login" />
+ <s:submit name="login" />
</td>
</tr>
</table>
@@ -104,7 +104,7 @@
</div>
</div>
-</stripes:form>
+</s:form>
</wiki:Tab>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/LostPasswordContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/LostPasswordContent.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/LostPasswordContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/LostPasswordContent.jsp Mon Jun 8 01:45:59 2009
@@ -21,7 +21,7 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<wiki:TabbedSection defaultTab="lostpassword">
@@ -33,8 +33,8 @@
<wiki:Tab id="lostpassword" titleKey="login.lostpw.tab">
<div class="center">
-<stripes:form beanclass="org.apache.wiki.action.LoginActionBean" id="lostpw" class="wikiform" method="post" acceptcharset="UTF-8">
- <stripes:param name="tab" value="lostpassword" />
+<s:form beanclass="org.apache.wiki.action.LoginActionBean" id="lostpw" class="wikiform" acceptcharset="UTF-8">
+ <s:param name="tab" value="lostpassword" />
<h3><fmt:message key="login.lostpw.heading" /></h3>
<c:choose>
@@ -60,13 +60,13 @@
</tr>
</c:if>
<tr>
- <td><stripes:label for="email" /></td>
- <td><stripes:text size="24" name="email" id="email" /></td>
+ <td><s:label for="email" /></td>
+ <td><s:text size="24" name="email" id="email" /></td>
</tr>
<tr>
<td> </td>
<td>
- <stripes:submit name="resetPassword" />
+ <s:submit name="resetPassword" />
</td>
</tr>
</table>
@@ -90,7 +90,7 @@
</c:otherwise>
</c:choose>
-</stripes:form>
+</s:form>
</div>
</wiki:Tab>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/NewGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/NewGroupContent.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/NewGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/NewGroupContent.jsp Mon Jun 8 01:45:59 2009
@@ -29,7 +29,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%
// Extract the group name and members
@@ -70,7 +70,7 @@
<table class="wikitable">
<!-- Name -->
<tr>
- <th><stripes:label name="newgroup.name" /></th>
+ <th><s:label name="newgroup.name" /></th>
<td><input type="text" name="group" size="30" value="<%=name%>" />
<div class="formhelp">
<fmt:message key="newgroup.name.description" />
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsTop.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsTop.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsTop.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsTop.jsp Mon Jun 8 01:45:59 2009
@@ -21,7 +21,7 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<div id="actionsTop" class="pageactions">
<ul>
@@ -30,23 +30,23 @@
<li>
<wiki:PageType type="page">
<c:set var="editTitle"><fmt:message key="actions.edit.title" /></c:set>
- <stripes:link
+ <s:link
beanclass="org.apache.wiki.action.EditActionBean" event="edit"
accesskey="e" class="action edit"
title="${editTitle}">
<fmt:message key='actions.edit' />
- <stripes:param name="page" value="${wikiContext.page.name}" />
- </stripes:link>
+ <s:param name="page" value="${wikiContext.page.name}" />
+ </s:link>
</wiki:PageType>
<wiki:PageType type="attachment">
<c:set var="editParentTitle"><fmt:message key="actions.editparent.title" /></c:set>
- <stripes:link
+ <s:link
beanclass="org.apache.wiki.action.EditActionBean" event="edit"
accesskey="e" class="action edit"
title="${editParentTitle}">
<fmt:message key='actions.edit' />
- <stripes:param name="page"><wiki:ParentPageName/></stripes:param>
- </stripes:link>
+ <s:param name="page"><wiki:ParentPageName/></s:param>
+ </s:link>
</wiki:PageType>
</li>
</wiki:Permission>
@@ -54,12 +54,12 @@
<%-- converted to popup menu by jspwiki-common.js--%>
<li id="morebutton">
- <stripes:link
+ <s:link
beanclass="org.apache.wiki.action.ViewActionBean"
class="action more">
- <stripes:param name="page" value="MoreMenu" />
+ <s:param name="page" value="MoreMenu" />
<fmt:message key="actions.more" />
- </stripes:link>
+ </s:link>
</li>
</ul>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp Mon Jun 8 01:45:59 2009
@@ -20,7 +20,7 @@
--%>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%-- Provides a simple searchbox that can be easily included anywhere on the page --%>
<%-- Powered by jswpwiki-common.js//SearchBox --%>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp Mon Jun 8 01:45:59 2009
@@ -21,7 +21,7 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<div class="userbox">
<wiki:UserCheck status="anonymous">
@@ -49,37 +49,37 @@
<wiki:CheckRequestContext context='!login'>
<wiki:Permission permission="login">
<c:set var="loginTitle"><fmt:message key='actions.login.title' /></c:set>
- <stripes:link
+ <s:link
beanclass="org.apache.wiki.action.LoginActionBean"
class="action login"
title="${loginTitle}">
- <stripes:param name="redirect" value="${wikiContext.page.name}" />
+ <s:param name="redirect" value="${wikiContext.page.name}" />
<fmt:message key="actions.login"/>
- </stripes:link>
+ </s:link>
</wiki:Permission>
</wiki:CheckRequestContext>
</wiki:UserCheck>
<wiki:UserCheck status="authenticated">
<c:set var="logoutTitle"><fmt:message key='actions.logout.title' /></c:set>
- <stripes:link
+ <s:link
beanclass="org.apache.wiki.action.LoginActionBean" event="logout"
class="action logout"
title="${logoutTitle}">
<fmt:message key="actions.logout"/>
- </stripes:link>
+ </s:link>
</wiki:UserCheck>
<wiki:CheckRequestContext context='!prefs'>
<wiki:CheckRequestContext context='!preview'>
<c:set var="prefsTitle"><fmt:message key='actions.prefs.title' /></c:set>
- <stripes:link
+ <s:link
beanclass="org.apache.wiki.action.UserPreferencesActionBean"
class="action prefs" accesskey="p"
title="${prefsTitle}">
- <stripes:param name="redirect" value="${wikiContext.page.name}" />
+ <s:param name="redirect" value="${wikiContext.page.name}" />
<fmt:message key="actions.prefs"/>
- </stripes:link>
+ </s:link>
</wiki:CheckRequestContext>
</wiki:CheckRequestContext>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/WorkflowContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/WorkflowContent.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/WorkflowContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/WorkflowContent.jsp Mon Jun 8 01:45:59 2009
@@ -24,7 +24,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<script language="JavaScript">
function SubmitOutcomeIfSelected(selectId)
{
@@ -61,11 +61,13 @@
</div>
<table class="wikitable">
<thead>
- <th width="5%" align="center"><fmt:message key="workflow.id" /></th>
- <th width="45%" align="left"><fmt:message key="workflow.item" /></th>
- <th width="15%" align="left"><fmt:message key="workflow.actions" /></th>
- <th width="15%" align="left"><fmt:message key="workflow.requester" /></th>
- <th width="20%" align="left"><fmt:message key="workflow.startTime" /></th>
+ <tr>
+ <th width="5%" align="center"><fmt:message key="workflow.id" /></th>
+ <th width="45%" align="left"><fmt:message key="workflow.item" /></th>
+ <th width="15%" align="left"><fmt:message key="workflow.actions" /></th>
+ <th width="15%" align="left"><fmt:message key="workflow.requester" /></th>
+ <th width="20%" align="left"><fmt:message key="workflow.startTime" /></th>
+ </tr>
</thead>
<tbody>
<% i = 1; %>
@@ -142,11 +144,13 @@
</div>
<table class="wikitable">
<thead>
- <th width="5%" align="center"><fmt:message key="workflow.id" /></th>
- <th width="45%" align="left"><fmt:message key="workflow.item" /></th>
- <th width="15%" align="left"><fmt:message key="workflow.actions" /></th>
- <th width="15%" align="left"><fmt:message key="workflow.actor" /></th>
- <th width="20%" align="left"><fmt:message key="workflow.startTime" /></th>
+ <tr>
+ <th width="5%" align="center"><fmt:message key="workflow.id" /></th>
+ <th width="45%" align="left"><fmt:message key="workflow.item" /></th>
+ <th width="15%" align="left"><fmt:message key="workflow.actions" /></th>
+ <th width="15%" align="left"><fmt:message key="workflow.actor" /></th>
+ <th width="20%" align="left"><fmt:message key="workflow.startTime" /></th>
+ </tr>
</thead>
<% i = 1; %>
<tbody>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/admin/AdminTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/admin/AdminTemplate.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/admin/AdminTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/admin/AdminTemplate.jsp Mon Jun 8 01:45:59 2009
@@ -24,7 +24,7 @@
<%@ page import="org.apache.wiki.ui.admin.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
<html>
<head>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/admin/UserManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/admin/UserManagement.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/admin/UserManagement.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/admin/UserManagement.jsp Mon Jun 8 01:45:59 2009
@@ -26,7 +26,7 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<script>
function constructdate(date)
{
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp?rev=782500&r1=782499&r2=782500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp Mon Jun 8 01:45:59 2009
@@ -33,7 +33,7 @@
<%@ page import="org.apache.commons.lang.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
<%--
This provides the FCK editor for JSPWiki.