You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/12/20 06:49:26 UTC

svn commit: r728241 - in /incubator/jspwiki/trunk: ./ etc/ src/webdocs/ src/webdocs/admin/ src/webdocs/templates/default/ src/webdocs/templates/default/admin/ src/webdocs/templates/default/editors/ src/webdocs/templates/raw/

Author: ajaquith
Date: Fri Dec 19 21:49:24 2008
New Revision: 728241

URL: http://svn.apache.org/viewvc?rev=728241&view=rev
Log:
Removed jspwiki & stripes TLDs from WEB-INF; they are both in their respective jars' META-INF directories now.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/etc/jspwiki.tld
    incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
    incubator/jspwiki/trunk/src/webdocs/Comment.jsp
    incubator/jspwiki/trunk/src/webdocs/CookieError.jsp
    incubator/jspwiki/trunk/src/webdocs/Delete.jsp
    incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
    incubator/jspwiki/trunk/src/webdocs/Diff.jsp
    incubator/jspwiki/trunk/src/webdocs/Edit.jsp
    incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
    incubator/jspwiki/trunk/src/webdocs/Error.jsp
    incubator/jspwiki/trunk/src/webdocs/Group.jsp
    incubator/jspwiki/trunk/src/webdocs/Install.jsp
    incubator/jspwiki/trunk/src/webdocs/Message.jsp
    incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp
    incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
    incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
    incubator/jspwiki/trunk/src/webdocs/Preview.jsp
    incubator/jspwiki/trunk/src/webdocs/Rename.jsp
    incubator/jspwiki/trunk/src/webdocs/Search.jsp
    incubator/jspwiki/trunk/src/webdocs/Upload.jsp
    incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
    incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
    incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp
    incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp
    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/CreateProfileContent.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/DisplayMessage.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/EditLayout.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/ViewLayout.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.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/plain.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri Dec 19 21:49:24 2008
@@ -6,6 +6,8 @@
         code so that it is much simpler, and leverages Stripes. UserPreferences.jsp and
         the collaborating UserPreferencesActionBean, in particular, are excellent
         examples of what the JSPs will look like when we are done migrating everything.
+        A few bugs remain. Removed jspwiki & stripes TLDs from WEB-INF; they are
+        both in their respective jars' META-INF directories now.
 
 2008-12-19 Harry Metske <me...@apache.org>
 

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Fri Dec 19 21:49:24 2008
@@ -338,6 +338,7 @@
          <fileset dir="${code.src}" includes="templates/**/*.properties" />
          <fileset dir="${code.i18n}" />
          <fileset dir="etc" includes="ini/*.xml ini/*.properties" />
+         <metainf dir="etc" includes="jspwiki.tld" />
       </jar>
   </target>
 
@@ -430,7 +431,7 @@
          <include name="commons-logging.properties" />
          <include name="jspwiki.policy" />
          <include name="jspwiki.properties" />
-         <include name="*.tld" />
+         <include name="oscache.tld" />
          <include name="userdatabase.xml" />
          <include name="groupdatabase.xml" />
        </webinf>
@@ -857,7 +858,7 @@
           <include name="dtd/**" />
           <include name="commons-logging.properties" />
           <include name="jspwiki.policy" />
-          <include name="*.tld" />
+          <include name="oscache.tld" />
         </fileset>
         <fileset dir="tests/etc" includes="userdatabase.xml groupdatabase.xml" />
       </copy>

Modified: incubator/jspwiki/trunk/etc/jspwiki.tld
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.tld?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.tld (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.tld Fri Dec 19 21:49:24 2008
@@ -4,14 +4,12 @@
 
 <!--
      JSPWiki tag libraries are defined here.
-
-     Note that we support only the 1.1 spec for now,
-     simply because there is no reason to break compatibility.
  -->
 <taglib>
-  <tlibversion>1.0</tlibversion>
-  <jspversion>1.1</jspversion>
+  <tlibversion>3.0</tlibversion>
+  <jspversion>2.0</jspversion>
   <shortname>jspwiki</shortname>
+  <uri>http://jakarta.apache.org/jspwiki.tld</uri>
 
   <tag>
     <name>AdminBeanIterator</name>

Modified: incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Captcha.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Captcha.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Captcha.jsp Fri Dec 19 21:49:24 2008
@@ -8,10 +8,10 @@
 <%@ page import="org.apache.commons.lang.time.StopWatch" %>
 <%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ 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="com.ecyrd.jspwiki.action.ViewActionBean" event="view" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" id="wikiActionBean" />
 
 
 <%!

Modified: incubator/jspwiki/trunk/src/webdocs/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Comment.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Comment.jsp Fri Dec 19 21:49:24 2008
@@ -13,12 +13,12 @@
 <%@ page import="com.ecyrd.jspwiki.preferences.Preferences.TimeFormat" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="javax.servlet.http.Cookie" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ 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" %>
 <%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.CommentActionBean" event="comment" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.CommentActionBean" event="comment" id="wikiActionBean" />
 <%!
     Logger log = LoggerFactory.getLogger("JSPWiki");
 

Modified: incubator/jspwiki/trunk/src/webdocs/CookieError.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/CookieError.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/CookieError.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/CookieError.jsp Fri Dec 19 21:49:24 2008
@@ -1,7 +1,7 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" id="wikiActionBean" />
 
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );

Modified: incubator/jspwiki/trunk/src/webdocs/Delete.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Delete.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Delete.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Delete.jsp Fri Dec 19 21:49:24 2008
@@ -4,9 +4,9 @@
 <%@ page import="java.util.*" %>
 <%@ page import="com.ecyrd.jspwiki.attachment.Attachment" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.DeleteActionBean" event="delete" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.DeleteActionBean" event="delete" id="wikiActionBean" />
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp Fri Dec 19 21:49:24 2008
@@ -5,7 +5,7 @@
 <%@ page import="com.ecyrd.jspwiki.auth.WikiSecurityException" %>
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/src/webdocs/Diff.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Diff.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Diff.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Diff.jsp Fri Dec 19 21:49:24 2008
@@ -4,9 +4,9 @@
 <%@ page import="com.ecyrd.jspwiki.util.*" %>
 <%@ page import="com.ecyrd.jspwiki.tags.InsertDiffTag" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="diff" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="diff" id="wikiActionBean" />
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 

Modified: incubator/jspwiki/trunk/src/webdocs/Edit.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Edit.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Edit.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Edit.jsp Fri Dec 19 21:49:24 2008
@@ -7,10 +7,10 @@
 <%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
 <%@ page import="com.ecyrd.jspwiki.workflow.DecisionRequiredException" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="edit" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="edit" id="wikiActionBean" />
 
 <%!
     Logger log = LoggerFactory.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp Fri Dec 19 21:49:24 2008
@@ -5,7 +5,7 @@
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/Error.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Error.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Error.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Error.jsp Fri Dec 19 21:49:24 2008
@@ -3,7 +3,7 @@
 <%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.action.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%@ page import="com.ecyrd.jspwiki.util.FileUtil" %>
 <%! 

Modified: incubator/jspwiki/trunk/src/webdocs/Group.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Group.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Group.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Group.jsp Fri Dec 19 21:49:24 2008
@@ -6,7 +6,7 @@
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/Install.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Install.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Install.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Install.jsp Fri Dec 19 21:49:24 2008
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.AuthenticationManager" %>
 <%@ page import="com.ecyrd.jspwiki.ui.Installer" %>
@@ -9,7 +9,7 @@
 <%@ 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="com.ecyrd.jspwiki.action.InstallActionBean" event="install" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.InstallActionBean" event="install" id="wikiActionBean" />
 
 
 <%!

Modified: incubator/jspwiki/trunk/src/webdocs/Message.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Message.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Message.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Message.jsp Fri Dec 19 21:49:24 2008
@@ -5,12 +5,12 @@
 <%@ page import="com.ecyrd.jspwiki.action.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.stripes.*" %>
 <%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.MessageActionBean" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.MessageActionBean" id="wikiActionBean" />
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
     WikiContext wikiContext = WikiContextFactory.findContext( pageContext );

Modified: incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp Fri Dec 19 21:49:24 2008
@@ -3,9 +3,9 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.plugin.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="edit" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="edit" id="wikiActionBean" />
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp Fri Dec 19 21:49:24 2008
@@ -6,7 +6,7 @@
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="java.util.*" %>
 <%@ page import="java.text.*" %>
 <%! 

Modified: incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/PageModified.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/PageModified.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/PageModified.jsp Fri Dec 19 21:49:24 2008
@@ -4,10 +4,10 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.PageModifiedActionBean" event="conflict" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.PageModifiedActionBean" event="conflict" id="wikiActionBean" />
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/src/webdocs/Preview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Preview.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Preview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Preview.jsp Fri Dec 19 21:49:24 2008
@@ -5,9 +5,9 @@
 <%@ page import="java.util.Date" %>
 <%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="preview" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="preview" id="wikiActionBean" />
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/Rename.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Rename.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Rename.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Rename.jsp Fri Dec 19 21:49:24 2008
@@ -3,13 +3,13 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="org.apache.jspwiki.api.WikiException" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="java.util.*" %>
 <%@ page import="java.text.*" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.RenameActionBean" event="rename" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.RenameActionBean" event="rename" id="wikiActionBean" />
 <%!
     Logger log = LoggerFactory.getLogger("JSPWiki");
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/Search.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Search.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Search.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Search.jsp Fri Dec 19 21:49:24 2008
@@ -6,10 +6,10 @@
 <%@ page import="java.util.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="com.ecyrd.jspwiki.search.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.SearchActionBean" event="find" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.SearchActionBean" event="find" id="wikiActionBean" />
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWikiSearch");

Modified: incubator/jspwiki/trunk/src/webdocs/Upload.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Upload.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Upload.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Upload.jsp Fri Dec 19 21:49:24 2008
@@ -2,9 +2,9 @@
 <%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.UploadActionBean" event="upload" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.UploadActionBean" event="upload" id="wikiActionBean" />
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Wiki.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Wiki.jsp Fri Dec 19 21:49:24 2008
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" id="wikiActionBean" id="wikiActionBean" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/PageContent.jsp" />

Modified: incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Workflow.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Workflow.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Workflow.jsp Fri Dec 19 21:49:24 2008
@@ -11,9 +11,9 @@
 <%@ page import="com.ecyrd.jspwiki.workflow.Outcome" %>
 <%@ page import="com.ecyrd.jspwiki.workflow.Workflow" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.WorkflowActionBean" event="view" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.WorkflowActionBean" event="view" id="wikiActionBean"/>
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 

Modified: incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp Fri Dec 19 21:49:24 2008
@@ -5,7 +5,7 @@
 <%@ page import="com.ecyrd.jspwiki.ui.TemplateManager" %>
 <%@ page import="org.apache.commons.lang.time.StopWatch" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 

Modified: incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="com.ecyrd.jspwiki.log.Logger" %>
 <%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
@@ -7,7 +7,7 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.NoneActionBean" event="none" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.NoneActionBean" event="none" id="wikiActionBean" />
 <%! 
   public void jspInit()
   {

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp Fri Dec 19 21:49:24 2008
@@ -1,7 +1,7 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" id="wikiActionBean" />
 <%! 
   public void jspInit()
   {

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp Fri Dec 19 21:49:24 2008
@@ -1,14 +1,13 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page language="java" pageEncoding="UTF-8" %>
 <%@ page import="com.ecyrd.jspwiki.log.Logger" %>
 <%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" id="wikiActionBean" />
 <%! 
   public void jspInit()
   {

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page language="java" pageEncoding="UTF-8" %>
 <%@ page import="com.ecyrd.jspwiki.log.Logger" %>
 <%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
@@ -15,7 +15,7 @@
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%@ page import="com.ecyrd.jspwiki.search.SearchResult" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.SearchActionBean" event="find" />
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.SearchActionBean" event="find" id="wikiActionBean" />
 <%! 
   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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.progress.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <wiki:TabbedSection>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/CreateProfileContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/CreateProfileContent.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/CreateProfileContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/CreateProfileContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.action.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,2 +1,2 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp Fri Dec 19 21:49:24 2008
@@ -1,7 +1,7 @@
 <%@ page import="com.ecyrd.jspwiki.tags.InsertDiffTag" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="java.util.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ 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" %>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ 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" %>
 

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="java.util.Arrays" %>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ 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" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.*" %>
 <%@ page import="java.util.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="java.util.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="java.text.MessageFormat" %>
 <%@ page import="java.util.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.action.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="java.util.Arrays" %>
 <%@ page import="java.util.ResourceBundle" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ 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" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ 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" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.attachment.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <wiki:TabbedSection defaultTab="${param.tab}">
 
   <wiki:Tab id="prefs" titleKey="prefs.tab.prefs" accesskey="p">

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp Fri Dec 19 21:49:24 2008
@@ -7,7 +7,7 @@
 
 <%@ page import="com.ecyrd.jspwiki.ui.*" %>
 <%@ page import="com.ecyrd.jspwiki.preferences.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ 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://java.sun.com/jsp/jstl/functions" prefix="fn" %> 

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ 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.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ 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" %>
 <%-- Provides a simple searchbox that can be easily included anywhere on the page --%>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ 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" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp Fri Dec 19 21:49:24 2008
@@ -1,6 +1,6 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ 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" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp Fri Dec 19 21:49:24 2008
@@ -3,7 +3,7 @@
 <%@ page import="com.ecyrd.jspwiki.ui.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.admin.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <html>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp Fri Dec 19 21:49:24 2008
@@ -3,7 +3,7 @@
 <%@ page import="com.ecyrd.jspwiki.rpc.json.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.admin.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ 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" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.*" %>
 <%@ page import="com.ecyrd.jspwiki.util.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp Fri Dec 19 21:49:24 2008
@@ -1,5 +1,5 @@
 <%@ page language="java" pageEncoding="UTF-8" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="java.util.Properties" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp Fri Dec 19 21:49:24 2008
@@ -1,5 +1,5 @@
 <%@ page language="java" import="java.util.*" pageEncoding="UTF-8" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>

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=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp Fri Dec 19 21:49:24 2008
@@ -1,5 +1,5 @@
 <%@ page language="java" pageEncoding="UTF-8" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.*" %>
 <%@ page import="com.ecyrd.jspwiki.filters.*" %>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp?rev=728241&r1=728240&r2=728241&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp Fri Dec 19 21:49:24 2008
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <% response.setContentType("text/plain; charset=UTF-8"); %>
 <pre>
 <wiki:InsertPage mode="plain" />