You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/07/11 21:40:20 UTC

svn commit: r1502339 [1/2] - in /incubator/jspwiki/trunk: ./ jspwiki-site/src/site/trunk/templates/ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/resources/META-INF/ jspwiki-war/src/main/webapp/ jspwiki-war/src/main/webapp/WEB-INF/ js...

Author: gmazza
Date: Thu Jul 11 19:40:18 2013
New Revision: 1502339

URL: http://svn.apache.org/r1502339
Log:
Updated jspwiki.tld to JSP 2.1

Added:
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld
Removed:
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/jspwiki.tld
Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
    incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/FCK.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp
    incubator/jspwiki/trunk/pom.xml

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Jul 11 19:40:18 2013
@@ -1,3 +1,21 @@
+2013-07-11  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.10.0-svn-17
+       
+       * Moved jspwiki.tld to releases/META-INF/ so it becomes part of the JSPWiki JAR instead of 
+         standalone file
+ 
+       * Upgraded jspwiki.tld from JSP 1.1 to JSP 2.1 (requires Tomcat 6 or higher), new URL for taglib 
+         includes "incubator" but can be quickly changed should JSPWiki become TLP.
+
+2013-07-11  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.10.0-svn-16
+       
+       * Upgraded JSTL to 1.2 (which includes standard, so could remove that dependency)
+      
+       * Removed jstl-fmt.tld, oscache.tld in favor of versions within their respective JARs
+
 2013-07-03  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.10.0-svn-15

Modified: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Thu Jul 11 19:40:18 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-15
\ No newline at end of file
+JSPWiki v2.10.0-svn-16
\ No newline at end of file

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Thu Jul 11 19:40:18 2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "16";
+    public static final String     BUILD         = "17";
     
     /**
      *  This is the generic version string you should use

Added: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld?rev=1502339&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld (added)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld Thu Jul 11 19:40:18 2013
@@ -0,0 +1,857 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+-->
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+        version="2.1">
+
+  <tlib-version>2.10</tlib-version>
+  <short-name>jspwiki</short-name>
+  <uri>http://incubator.apache.org/jspwiki/tags</uri>
+
+  <tag>
+    <name>AdminBeanIterator</name>
+    <tag-class>org.apache.wiki.tags.AdminBeanIteratorTag</tag-class>
+    <tei-class>org.apache.wiki.tags.AdminBeanIteratorInfo</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>id</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>type</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>AttachmentsIterator</name>
+    <tag-class>org.apache.wiki.tags.AttachmentsIteratorTag</tag-class>
+    <tei-class>org.apache.wiki.tags.AttachmentsIteratorInfo</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>id</name>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>Author</name>
+    <tag-class>org.apache.wiki.tags.AuthorTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>BaseURL</name>
+    <tag-class>org.apache.wiki.tags.BaseURLTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>Breadcrumbs</name>
+    <tag-class>org.apache.wiki.tags.BreadcrumbsTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>maxpages</name>
+       <required>false</required><!-- the default value is 10 -->
+    </attribute>
+    <attribute>
+       <name>separator</name>
+       <required>false</required><!-- the default value is " | " -->
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>Calendar</name>
+    <tag-class>org.apache.wiki.tags.CalendarTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>pageformat</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>urlformat</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>monthurlformat</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>CheckLock</name>
+    <tag-class>org.apache.wiki.tags.CheckLockTag</tag-class>
+    <tei-class>org.apache.wiki.tags.CheckLockInfo</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>mode</name>
+    </attribute>
+    <attribute>
+       <name>id</name>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>CheckRequestContext</name>
+    <tag-class>org.apache.wiki.tags.CheckRequestContextTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>context</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>CheckVersion</name>
+    <tag-class>org.apache.wiki.tags.CheckVersionTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>mode</name>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>CommentLink</name>
+    <tag-class>org.apache.wiki.tags.CommentLinkTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>format</name>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>Content</name>
+    <tag-class>org.apache.wiki.tags.ContentTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>view</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>diff</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>info</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>preview</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>conflict</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>find</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>prefs</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>error</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>edit</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>comment</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>ContentEncoding</name>
+    <tag-class>org.apache.wiki.tags.ContentEncodingTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>DiffLink</name>
+    <tag-class>org.apache.wiki.tags.DiffLinkTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>format</name>
+    </attribute>
+    <attribute>
+       <name>version</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>newVersion</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>EditLink</name>
+    <tag-class>org.apache.wiki.tags.EditLinkTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>format</name>
+    </attribute>
+    <attribute>
+       <name>version</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>title</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>accesskey</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>Editor</name>
+    <tag-class>org.apache.wiki.tags.EditorTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <name>EditorIterator</name>
+    <tag-class>org.apache.wiki.tags.EditorIteratorTag</tag-class>
+    <tei-class>org.apache.wiki.tags.EditorIteratorInfo</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>id</name>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>FeedDiscovery</name>
+    <tag-class>org.apache.wiki.tags.FeedDiscoveryTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>HasAttachments</name>
+    <tag-class>org.apache.wiki.tags.HasAttachmentsTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <name>HistoryIterator</name>
+    <tag-class>org.apache.wiki.tags.HistoryIteratorTag</tag-class>
+    <tei-class>org.apache.wiki.tags.HistoryIteratorInfo</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>id</name>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>IfNoSearchResults</name>
+    <tag-class>org.apache.wiki.tags.IfNoSearchResultsTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <name>Include</name>
+    <tag-class>org.apache.wiki.tags.IncludeTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>IncludeResources</name>
+    <tag-class>org.apache.wiki.tags.IncludeResourcesTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>type</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+   </tag>
+
+  <tag>
+    <name>InsertDiff</name>
+    <tag-class>org.apache.wiki.tags.InsertDiffTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>InsertPage</name>
+    <tag-class>org.apache.wiki.tags.InsertPageTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>mode</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>Link</name>
+    <tag-class>org.apache.wiki.tags.LinkTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>format</name>
+    </attribute>
+    <attribute>
+       <name>version</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>class</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>style</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>title</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>target</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>compareToVersion</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>rel</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+        <attribute>
+       <name>jsp</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+        <attribute>
+       <name>ref</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+        <attribute>
+       <name>context</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>absolute</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>templatefile</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>accessKey</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>LinkTo</name>
+    <tag-class>org.apache.wiki.tags.LinkToTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>format</name>
+    </attribute>
+    <attribute>
+       <name>version</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>template</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>title</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>accesskey</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>LinkToParent</name>
+    <tag-class>org.apache.wiki.tags.LinkToParentTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>format</name>
+    </attribute>
+    <attribute>
+       <name>version</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>Messages</name>
+    <tag-class>org.apache.wiki.tags.MessagesTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>action</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>div</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>prefix</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>topic</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>NextVersion</name>
+    <tag-class>org.apache.wiki.tags.NextVersionTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>NoSuchPage</name>
+    <tag-class>org.apache.wiki.tags.NoSuchPageTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>PageExists</name>
+    <tag-class>org.apache.wiki.tags.PageExistsTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>PageInfoLink</name>
+    <tag-class>org.apache.wiki.tags.PageInfoLinkTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>format</name>
+    </attribute>
+    <attribute>
+       <name>title</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>accesskey</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+
+  <tag>
+    <name>PageDate</name>
+    <tag-class>org.apache.wiki.tags.PageDateTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <name>format</name>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>PageName</name>
+    <tag-class>org.apache.wiki.tags.PageNameTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>PageSize</name>
+    <tag-class>org.apache.wiki.tags.PageSizeTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>PageType</name>
+    <tag-class>org.apache.wiki.tags.PageTypeTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>type</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>PageVersion</name>
+    <tag-class>org.apache.wiki.tags.PageVersionTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <name>Param</name>
+    <tag-class>org.apache.wiki.tags.ParamTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>name</name>
+       <required>true</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>value</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>ParentPageName</name>
+    <tag-class>org.apache.wiki.tags.ParentPageNameTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>Permission</name>
+    <tag-class>org.apache.wiki.tags.PermissionTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>permission</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>PreviousVersion</name>
+    <tag-class>org.apache.wiki.tags.PreviousVersionTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>Plugin</name>
+    <tag-class>org.apache.wiki.tags.PluginTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>plugin</name>
+       <required>true</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>args</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>RequestResource</name>
+    <tag-class>org.apache.wiki.tags.RequestResourceTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>type</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>resource</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>RSSLink</name>
+    <tag-class>org.apache.wiki.tags.RSSLinkTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>RSSImageLink</name>
+    <tag-class>org.apache.wiki.tags.RSSImageLinkTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>title</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>mode</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>SearchResultIterator</name>
+    <tag-class>org.apache.wiki.tags.SearchResultIteratorTag</tag-class>
+    <tei-class>org.apache.wiki.tags.SearchResultIteratorInfo</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>id</name>
+    </attribute>
+    <attribute>
+       <name>maxItems</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>list</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>start</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>SearchResults</name>
+    <tag-class>org.apache.wiki.tags.SearchResultsTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <name>SearchResultsSize</name>
+    <tag-class>org.apache.wiki.tags.SearchResultsSizeTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>SetPagination</name>
+    <tag-class>org.apache.wiki.tags.SetPaginationTag</tag-class>
+    <body-content>empty</body-content>
+    <description>Returns pagination string and cache it in the pageContext</description>
+    <attribute>
+       <name>start</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>total</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>pagesize</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>maxlinks</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>fmtkey</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>href</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>onclick</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>TabbedSection</name>
+    <tag-class>org.apache.wiki.tags.TabbedSectionTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>A BodyTag for tabbed sections</description>
+    <attribute>
+      <name>defaultTab</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>Tab</name>
+    <tag-class>org.apache.wiki.tags.TabTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>A Tag for a tab, which is a child of tabbedSection</description>
+    <attribute>
+      <name>id</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>title</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>accesskey</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>url</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>TemplateDir</name>
+    <tag-class>org.apache.wiki.tags.TemplateDirTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>Translate</name>
+    <tag-class>org.apache.wiki.tags.TranslateTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <name>UploadLink</name>
+    <tag-class>org.apache.wiki.tags.UploadLinkTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>page</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>format</name>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>UserName</name>
+    <tag-class>org.apache.wiki.tags.UserNameTag</tag-class>
+    <body-content>empty</body-content>
+  </tag>
+
+  <tag>
+    <name>UserCheck</name>
+    <tag-class>org.apache.wiki.tags.UserCheckTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>status</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>exists</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>UserProfile</name>
+    <tag-class>org.apache.wiki.tags.UserProfileTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+       <name>property</name>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>Variable</name>
+    <tag-class>org.apache.wiki.tags.VariableTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+       <name>var</name>
+       <required>true</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+       <name>default</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+      <name>Cookie</name>
+      <tag-class>org.apache.wiki.tags.CookieTag</tag-class>
+      <body-content>empty</body-content>
+      <attribute>
+          <name>name</name>
+          <required>true</required>
+          <rtexprvalue>false</rtexprvalue>
+      </attribute>
+      <attribute>
+          <name>item</name>
+          <required>false</required>
+          <rtexprvalue>true</rtexprvalue>
+      </attribute>
+            <attribute>
+          <name>value</name>
+          <required>false</required>
+          <rtexprvalue>true</rtexprvalue>
+      </attribute>
+            <attribute>
+          <name>var</name>
+          <required>false</required>
+          <rtexprvalue>false</rtexprvalue>
+      </attribute>
+            <attribute>
+          <name>scope</name>
+          <required>false</required>
+          <rtexprvalue>false</rtexprvalue>
+      </attribute>
+            <attribute>
+          <name>clear</name>
+          <required>false</required>
+          <rtexprvalue>true</rtexprvalue>
+      </attribute>
+  </tag>
+</taglib>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp Thu Jul 11 19:40:18 2013
@@ -26,7 +26,7 @@
 <%@ page import="org.apache.wiki.ui.EditorManager" %>
 <%@ page import="org.apache.commons.lang.time.StopWatch" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setBundle basename="CoreResources"/>
 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp Thu Jul 11 19:40:18 2013
@@ -34,7 +34,7 @@
 <%@ page import="org.apache.wiki.preferences.Preferences.TimeFormat" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="javax.servlet.http.Cookie" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%!

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp Thu Jul 11 19:40:18 2013
@@ -18,7 +18,7 @@
 --%>
 
 <%@ page import="org.apache.wiki.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp Thu Jul 11 19:40:18 2013
@@ -25,7 +25,7 @@
 <%@ page import="org.apache.wiki.attachment.Attachment" %>
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%! 
     Logger log = Logger.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp Thu Jul 11 19:40:18 2013
@@ -24,7 +24,7 @@
 <%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%! 
     Logger log = Logger.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp Thu Jul 11 19:40:18 2013
@@ -23,7 +23,7 @@
 <%@ page import="org.apache.wiki.util.*" %>
 <%@ page import="org.apache.wiki.tags.InsertDiffTag" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp Thu Jul 11 19:40:18 2013
@@ -28,7 +28,7 @@
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%!
     Logger log = Logger.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp Thu Jul 11 19:40:18 2013
@@ -24,7 +24,7 @@
 <%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp Thu Jul 11 19:40:18 2013
@@ -21,7 +21,7 @@
 <%@ page import="org.apache.log4j.*" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.util.FileUtil" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp Thu Jul 11 19:40:18 2013
@@ -25,7 +25,7 @@
 <%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp Thu Jul 11 19:40:18 2013
@@ -18,7 +18,7 @@
 --%>
 
 <?xml version="1.0" encoding="UTF-8"?>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.AuthenticationManager" %>
 <%@ page import="org.apache.wiki.preferences.Preferences" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp Thu Jul 11 19:40:18 2013
@@ -31,7 +31,7 @@
 <%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="java.util.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%!
     Logger log = Logger.getLogger("JSPWiki");
 %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp Thu Jul 11 19:40:18 2013
@@ -21,7 +21,7 @@
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.tags.WikiTagBase" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%! 
     /**
      * This page contains the logic for finding and including

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp Thu Jul 11 19:40:18 2013
@@ -29,7 +29,7 @@
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page errorPage="/Error.jsp"%>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki"%>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.tags.WikiTagBase"%>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*"%>
 <%!Logger log = Logger.getLogger( "JSPWiki" );

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp Thu Jul 11 19:40:18 2013
@@ -21,7 +21,7 @@
 <%@ page import="org.apache.log4j.*" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.tags.WikiTagBase" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp Thu Jul 11 19:40:18 2013
@@ -21,7 +21,7 @@
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.plugin.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp Thu Jul 11 19:40:18 2013
@@ -25,7 +25,7 @@
 <%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="java.util.*" %>
 <%@ page import="java.text.*" %>
 <%! 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp Thu Jul 11 19:40:18 2013
@@ -22,7 +22,7 @@
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page import="org.apache.wiki.util.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp Thu Jul 11 19:40:18 2013
@@ -24,7 +24,7 @@
 <%@ page import="org.apache.wiki.ui.EditorManager" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%! 
     Logger log = Logger.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp Thu Jul 11 19:40:18 2013
@@ -24,7 +24,7 @@
 <%@ page import="java.util.Date" %>
 <%@ page import="org.apache.wiki.ui.EditorManager" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp Thu Jul 11 19:40:18 2013
@@ -25,7 +25,7 @@
 <%@ page import="org.apache.wiki.tags.BreadcrumbsTag.FixedQueue" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="java.util.*" %>
 <%@ page import="java.text.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp Thu Jul 11 19:40:18 2013
@@ -25,7 +25,7 @@
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page import="java.util.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%! 
     Logger log = Logger.getLogger("JSPWikiSearch");

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp Thu Jul 11 19:40:18 2013
@@ -21,7 +21,7 @@
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 
 <%! 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp Thu Jul 11 19:40:18 2013
@@ -33,7 +33,7 @@
 <%@ page import="org.apache.wiki.ui.TemplateManager" %>
 <%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp Thu Jul 11 19:40:18 2013
@@ -23,8 +23,8 @@
 <%@ page import="org.apache.wiki.util.*" %>
 <%@ page import="org.apache.commons.lang.time.StopWatch" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
-<%! 
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%!
     Logger log = Logger.getLogger("JSPWiki"); 
 %>
 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp Thu Jul 11 19:40:18 2013
@@ -30,7 +30,7 @@
 <%@ page import="org.apache.wiki.workflow.Outcome" %>
 <%@ page import="org.apache.wiki.workflow.Workflow" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp Thu Jul 11 19:40:18 2013
@@ -25,7 +25,8 @@
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page import="org.apache.commons.lang.time.StopWatch" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+
 <%! 
     Logger log = Logger.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="org.apache.log4j.*" %>
 <%@ page import="org.apache.wiki.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp Thu Jul 11 19:40:18 2013
@@ -19,7 +19,7 @@
 
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%! 
   public void jspInit()
   {

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp Thu Jul 11 19:40:18 2013
@@ -17,14 +17,13 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ page language="java" pageEncoding="UTF-8"%>
 <%@ page import="org.apache.log4j.*" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.*" %>
 <%@ page import="org.apache.wiki.auth.permissions.*" %>
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%! 
   public void jspInit()

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page language="java" pageEncoding="UTF-8"%>
 <%@ page import="org.apache.log4j.*" %>
 <%@ page import="org.apache.wiki.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.*" %>
 <%@ page import="org.apache.wiki.ui.progress.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <fmt:setLocale value="${prefs.Language}" />

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,5 +17,5 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <wiki:Include page="InfoContent.jsp"/>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp Thu Jul 11 19:40:18 2013
@@ -20,7 +20,7 @@
 <%@ page import="org.apache.wiki.tags.InsertDiffTag" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="java.util.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" 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/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" 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/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ 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/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" 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/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <fmt:setLocale value="${prefs.Language}" />

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.ui.*" %>
 <%@ page import="java.util.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" 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/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="java.text.MessageFormat" %>
 <%@ page import="java.util.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="org.apache.wiki.*" %>
 <fmt:setLocale value="${prefs.Language}" />

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.*" %>
 <%@ page import="org.apache.wiki.auth.permissions.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="java.util.Arrays" %>
 <%@ page import="java.util.ResourceBundle" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.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/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.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/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.attachment.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.ui.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp Thu Jul 11 19:40:18 2013
@@ -26,7 +26,7 @@
 
 <%@ page import="org.apache.wiki.ui.*" %>
 <%@ page import="org.apache.wiki.preferences.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" 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/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.ui.EditorManager" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.*" %>
 <%@ page import="org.apache.wiki.auth.user.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ page import="org.apache.wiki.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="org.apache.wiki.*" %>
 <fmt:setBundle basename="templates.default"/>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp Thu Jul 11 19:40:18 2013
@@ -19,7 +19,7 @@
 
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="org.apache.wiki.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" 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/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp Thu Jul 11 19:40:18 2013
@@ -22,7 +22,7 @@
 <%@ page import="org.apache.wiki.ui.*" %>
 <%@ page import="org.apache.wiki.ui.admin.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <html>
 <head>
 <title>JSPWiki administration</title>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp Thu Jul 11 19:40:18 2013
@@ -22,7 +22,7 @@
 <%@ page import="org.apache.wiki.rpc.json.*" %>
 <%@ page import="org.apache.wiki.ui.admin.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" 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:setLocale value="${prefs.Language}" />

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp Thu Jul 11 19:40:18 2013
@@ -17,7 +17,7 @@
     under the License.  
 --%>
 
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.ui.*" %>
 <%@ page import="org.apache.wiki.util.*" %>