Author: ajaquith
Date: Sat Mar 1 08:24:37 2008
New Revision: 632618
URL: http://svn.apache.org/viewvc?rev=632618&view=rev
Log:
Reverted the JSP changes from my last commit so that existing 2.6 deployments
don't need to reconfigure web.xml. That commit removed the fmt:setBundle tag
because of the addition of a servlet config parameter in web.xml. The web.xml
modifications remain, however, so that any new JSPs won't need to use
setBundle. For 2.8, we will remove the setBundle tags entirely.
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/WikiWizard.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp Sat
Mar 1 08:24:37 2008
@@ -12,6 +12,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.*" %>
+<fmt:setBundle basename="templates.default"/>
<%!
public void jspInit()
{
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp Sat
Mar 1 08:24:37 2008
@@ -5,6 +5,7 @@
<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
<%@ page import="java.security.Permission" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%
int MAXATTACHNAMELENGTH = 30;
WikiContext c = WikiContext.findContext(pageContext);
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
Sat Mar 1 08:24:37 2008
@@ -2,6 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
int attCount =
c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
Sat Mar 1 08:24:37 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<wiki:TabbedSection >
<wiki:Tab id="conflict"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"conflict.oops.title")%>'>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp Sat
Mar 1 08:24:37 2008
@@ -1,3 +1,4 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<wiki:Include page="InfoContent.jsp"/>
\ No newline at end of file
+<fmt:setBundle basename="templates.default"/>
+<wiki:Include page="InfoContent.jsp"/>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp Sat Mar
1 08:24:37 2008
@@ -5,6 +5,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
List history = c.getEngine().getVersionHistory(c.getPage().getName());
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp Sat
Mar 1 08:24:37 2008
@@ -3,6 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
int attCount =
c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
Sat Mar 1 08:24:37 2008
@@ -1,5 +1,6 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%@ page import="java.security.Principal" %>
<%@ page import="java.util.Arrays" %>
<%@ page import="com.ecyrd.jspwiki.auth.PrincipalComparator" %>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp Sat
Mar 1 08:24:37 2008
@@ -1,5 +1,6 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html id="top" xmlns="http://www.w3.org/1999/xhtml";>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp Sat Mar
1 08:24:37 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%@ page import="com.ecyrd.jspwiki.*" %>
<div id="favorites">
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp Sat
Mar 1 08:24:37 2008
@@ -7,6 +7,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.*" %>
+<fmt:setBundle basename="templates.default"/>
<wiki:TabbedSection>
<wiki:Tab id="findcontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "find.tab")%>'
accesskey="s">
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp Sat Mar 1
08:24:37 2008
@@ -2,6 +2,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
String frontpage = c.getEngine().getFrontPage();
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp Sat
Mar 1 08:24:37 2008
@@ -9,6 +9,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp Sat Mar
1 08:24:37 2008
@@ -11,6 +11,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%!
String printWikiGroupPutGroup( Group group, String name, boolean cursor,
PageContext pageContext)
{
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp Sat Mar 1
08:24:37 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
String frontpage = c.getEngine().getFrontPage();
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Sat
Mar 1 08:24:37 2008
@@ -7,6 +7,7 @@
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
WikiPage wikiPage = c.getPage();
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp Sat
Mar 1 08:24:37 2008
@@ -6,6 +6,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
String postURL = "";
WikiContext ctx = WikiContext.findContext( pageContext );
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
Sat Mar 1 08:24:37 2008
@@ -9,6 +9,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
// Extract the group name and members
String name = request.getParameter( "group" );
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
Sat Mar 1 08:24:37 2008
@@ -2,6 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
WikiPage wikipage = c.getPage();
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
Sat Mar 1 08:24:37 2008
@@ -2,6 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%
//WikiContext c = WikiContext.findContext(pageContext);
//String frontpage = c.getEngine().getFrontPage();
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp Sat
Mar 1 08:24:37 2008
@@ -3,6 +3,7 @@
<%@ page import="com.ecyrd.jspwiki.attachment.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
int attCount =
c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp Sat Mar
1 08:24:37 2008
@@ -2,6 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %><%--CHECK why is this needed
--%>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
WikiPage p = c.getPage();
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
(original)
+++
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
Sat Mar 1 08:24:37 2008
@@ -3,6 +3,7 @@
<%@ page import="com.ecyrd.jspwiki.ui.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext context = WikiContext.findContext( pageContext );
TemplateManager.addResourceRequest( context, "script",
"scripts/jspwiki-prefs.js" );
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
Sat Mar 1 08:24:37 2008
@@ -7,6 +7,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.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
/* see commonheader.jsp */
String prefDateFormat = Preferences.getPreference(pageContext,"DateFormat");
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
Sat Mar 1 08:24:37 2008
@@ -2,6 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%-- Inserts page content for preview. --%>
<wiki:TabbedSection>
<wiki:Tab id="previewcontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "preview.tab")%>'>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp Sat
Mar 1 08:24:37 2008
@@ -6,6 +6,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.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
/* dateformatting not yet supported by wiki:UserProfile tag - diy */
WikiContext wikiContext = WikiContext.findContext(pageContext);
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp Sat Mar
1 08:24:37 2008
@@ -1,5 +1,6 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%-- Provides a simple searchbox that can be easily included anywhere on the
page --%>
<%-- Powered by jswpwiki-common.js//SearchBox --%>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
Sat Mar 1 08:24:37 2008
@@ -2,6 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
int attCount =
c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp Sat Mar
1 08:24:37 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%
WikiContext c = WikiContext.findContext(pageContext);
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
Sat Mar 1 08:24:37 2008
@@ -4,6 +4,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.*" %>
+<fmt:setBundle basename="templates.default"/>
<script language="JavaScript">
function SubmitOutcomeIfSelected(selectId)
{
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
(original)
+++
incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
Sat Mar 1 08:24:37 2008
@@ -6,6 +6,7 @@
<%@ taglib uri="/WEB-INF/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" %>
+<fmt:setBundle basename="templates.default"/>
<script>
function constructdate(date)
{
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp Sat
Mar 1 08:24:37 2008
@@ -6,6 +6,7 @@
<%@ page import="java.util.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%--
This file provides a common header which includes the important JSPWiki
scripts and other files.
You need to include this in your template, within <head> and </head>. It
is recommended that
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp Sat
Mar 1 08:24:37 2008
@@ -9,6 +9,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" %>
+<fmt:setBundle basename="templates.default"/>
<%--
This provides the FCK editor for JSPWiki.
--%>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/WikiWizard.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/WikiWizard.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/WikiWizard.jsp
(original)
+++
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/WikiWizard.jsp
Sat Mar 1 08:24:37 2008
@@ -10,6 +10,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" %>
+<fmt:setBundle basename="templates.default"/>
<%--
This provides the WikiWizard editor for JSPWiki.
--%>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp Sat
Mar 1 08:24:37 2008
@@ -8,6 +8,7 @@
<%@ page import="com.ecyrd.jspwiki.rpc.json.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<fmt:setBundle basename="templates.default"/>
<%--
This is a plain editor for JSPWiki.
--%>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp?rev=632618&r1=632617&r2=632618&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
Sat Mar 1 08:24:37 2008
@@ -5,6 +5,7 @@
<%@ page import="com.ecyrd.jspwiki.filters.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%--
This is a special editor component for JSPWiki preview storage.
--%>
