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/08/15 21:29:13 UTC
svn commit: r1514451 - in /jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/tags/ jspwiki-war/src/main...
Author: gmazza
Date: Thu Aug 15 19:29:11 2013
New Revision: 1514451
URL: http://svn.apache.org/r1514451
Log:
Updated URI for JSPWiki taglib library, removed long-deprecated RSSLinkTag class
Removed:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/RSSLinkTag.java
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld
jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/geronimo-web.xml
jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml
jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/FCK.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Thu Aug 15 19:29:11 2013
@@ -1,5 +1,13 @@
2013-08-15 Glen Mazza (gmazza AT apache DOT org)
+ * 2.10.0-svn-41
+
+ * Removed "incubator" from JSPWiki taglib URI, removed deprecated in 2004 RSSLinkTag
+
+ * Some simplifications to web.xml put in, taking advantage of 2.5 web.xml format.
+
+2013-08-15 Glen Mazza (gmazza AT apache DOT org)
+
* 2.10.0-svn-40
* Removed unneeded config files in Selenium IT module, changed its packaging to WAR
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext Thu Aug 15 19:29:11 2013
@@ -1,5 +1,18 @@
Title: Changelog
+#### 2013-08-15 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-40
+
+* Removed unneeded config files in Selenium IT module, changed its packaging to WAR
+ and its parent to the it tests folder. JDBC tests still inoperative, but others
+ working as before.
+
+* Removed jdbc.properties file in favor of configuring it in jspwiki-custom.properties.
+
+* jspwiki.policy file in test updated to more recent structure used by the integrated
+ tests module, subsequently removed from latter as it's unneeded there.
+
#### 2013-08-14 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-39
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Thu Aug 15 19:29:11 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-39
\ No newline at end of file
+JSPWiki v2.10.0-svn-40
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Thu Aug 15 19:29:11 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 = "40";
+ public static final String BUILD = "41";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld Thu Aug 15 19:29:11 2013
@@ -24,7 +24,7 @@
<tlib-version>2.10</tlib-version>
<short-name>jspwiki</short-name>
- <uri>http://incubator.apache.org/jspwiki/tags</uri>
+ <uri>http://jspwiki.apache.org/tags</uri>
<tag>
<name>AdminBeanIterator</name>
@@ -614,12 +614,6 @@
</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>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Captcha.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<fmt:setBundle basename="CoreResources"/>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%!
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/CookieError.jsp Thu Aug 15 19:29:11 2013
@@ -18,7 +18,7 @@
--%>
<%@ page import="org.apache.wiki.*" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib prefix="wiki" uri="http://jspwiki.apache.org/tags" %>
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/DeleteGroup.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Diff.jsp Thu Aug 15 19:29:11 2013
@@ -23,7 +23,7 @@
<%@ page import="org.apache.wiki.util.*" %>
<%@ page import="org.apache.wiki.tags.InsertDiffTag" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/EditGroup.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp Thu Aug 15 19:29:11 2013
@@ -21,8 +21,8 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.util.FileUtil" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
-<%!
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%!
Logger log = Logger.getLogger("JSPWiki");
%>
<%
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Group.jsp Thu Aug 15 19:29:11 2013
@@ -25,8 +25,8 @@
<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
-<%!
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp Thu Aug 15 19:29:11 2013
@@ -18,7 +18,7 @@
--%>
<?xml version="1.0" encoding="UTF-8"?>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.AuthenticationManager" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp Thu Aug 15 19:29:11 2013
@@ -31,7 +31,7 @@
<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="java.util.*" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/LoginForm.jsp Thu Aug 15 19:29:11 2013
@@ -21,8 +21,8 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.tags.WikiTagBase" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
-<%!
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%!
/**
* This page contains the logic for finding and including
the correct login form, which is usually loaded from
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/LostPassword.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.tags.WikiTagBase"%>
<%@ page import="javax.servlet.jsp.jstl.fmt.*"%>
<%!Logger log = Logger.getLogger( "JSPWiki" );
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Message.jsp Thu Aug 15 19:29:11 2013
@@ -21,7 +21,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.tags.WikiTagBase" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/NewBlogEntry.jsp Thu Aug 15 19:29:11 2013
@@ -21,7 +21,7 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.plugin.*" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/NewGroup.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="java.util.*" %>
<%@ page import="java.text.*" %>
<%!
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/PageInfo.jsp Thu Aug 15 19:29:11 2013
@@ -22,7 +22,7 @@
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.*" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/PageModified.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Preview.jsp Thu Aug 15 19:29:11 2013
@@ -24,7 +24,7 @@
<%@ page import="java.util.Date" %>
<%@ page import="org.apache.wiki.ui.EditorManager" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Rename.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="java.util.*" %>
<%@ page import="java.text.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp Thu Aug 15 19:29:11 2013
@@ -25,7 +25,7 @@
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="java.util.*" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWikiSearch");
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Upload.jsp Thu Aug 15 19:29:11 2013
@@ -21,7 +21,7 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Aug 15 19:29:11 2013
@@ -1,5 +1,4 @@
-
-<!--
+<!--
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
@@ -30,4 +29,4 @@
<sys:filter>org.jdom</sys:filter>
</sys:hidden-classes>
</sys:environment>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml Thu Aug 15 19:29:11 2013
@@ -18,10 +18,10 @@
under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<description>
JSPWiki is an open source JSP-based WikiClone. It is licensed
@@ -66,32 +66,17 @@
<filter-mapping>
<filter-name>WikiServletFilter</filter-name>
<url-pattern>/attach/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>WikiServletFilter</filter-name>
<url-pattern>/atom/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>WikiServletFilter</filter-name>
<url-pattern>/RPCU/</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>WikiServletFilter</filter-name>
<url-pattern>/RPC2/</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>WikiServletFilter</filter-name>
<url-pattern>/JSON-RPC</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>WikiJSPFilter</filter-name>
- <url-pattern>/wiki/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>WikiJSPFilter</filter-name>
+ <url-pattern>/wiki/*</url-pattern>
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
-
+
<!--
HttpSessionListener used for managing WikiSession's.
-->
@@ -165,35 +150,6 @@
<servlet-class>org.apache.wiki.attachment.AttachmentServlet</servlet-class>
</servlet>
- <!-- PLACEHOLDER FOR PRE-COMPILED JSP SERVLETS -->
-
- <!--
- And finally, let us tell the servlet container which
- URLs should correspond to which XML RPC servlet.
- -->
-
- <!-- By default, this is disabled. If you want to enabled it,
- just uncomment the whole section. -->
-
- <!-- REMOVE ME TO ENABLE XML-RPC
-
- <servlet-mapping>
- <servlet-name>XMLRPC</servlet-name>
- <url-pattern>/RPC2/</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>XMLRPC-UTF8</servlet-name>
- <url-pattern>/RPCU/</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ATOM</servlet-name>
- <url-pattern>/atom/*</url-pattern>
- </servlet-mapping>
-
- AND REMOVE ME TOO -->
-
<servlet-mapping>
<servlet-name>AttachmentServlet</servlet-name>
<url-pattern>/attach/*</url-pattern>
@@ -209,6 +165,30 @@
<url-pattern>/JSON-RPC</url-pattern>
</servlet-mapping>
+ <!--
+ And finally, let us tell the servlet container which
+ URLs should correspond to which XML RPC servlet.
+ By default, this is disabled. If you want to enable it,
+ just uncomment the whole section.
+ -->
+
+ <!-- REMOVE ME TO ENABLE XML-RPC
+ <servlet-mapping>
+ <servlet-name>XMLRPC</servlet-name>
+ <url-pattern>/RPC2/</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>XMLRPC-UTF8</servlet-name>
+ <url-pattern>/RPCU/</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ATOM</servlet-name>
+ <url-pattern>/atom/*</url-pattern>
+ </servlet-mapping>
+ AND REMOVE ME TOO -->
+
<!-- This means that we don't have to use redirection
from index.html anymore. Yay! -->
<welcome-file-list>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Wiki.jsp Thu Aug 15 19:29:11 2013
@@ -23,7 +23,7 @@
<%@ page import="org.apache.wiki.util.*" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Workflow.jsp Thu Aug 15 19:29:11 2013
@@ -30,9 +30,8 @@
<%@ page import="org.apache.wiki.workflow.Outcome" %>
<%@ page import="org.apache.wiki.workflow.Workflow" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
-
-<%!
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp Thu Aug 15 19:29:11 2013
@@ -25,7 +25,7 @@
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="java.security.Principal" %>
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXCategories.jsp Thu Aug 15 19:29:11 2013
@@ -19,7 +19,7 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%!
public void jspInit()
{
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXPreview.jsp Thu Aug 15 19:29:11 2013
@@ -23,7 +23,7 @@
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.permissions.*" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%!
public void jspInit()
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page language="java" pageEncoding="UTF-8"%>
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.ui.progress.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/CommentContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ConflictContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,5 +17,5 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<wiki:Include page="InfoContent.jsp"/>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DiffTab.jsp Thu Aug 15 19:29:11 2013
@@ -20,7 +20,7 @@
<%@ page import="org.apache.wiki.tags.InsertDiffTag" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="java.util.*" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/DisplayMessage.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Favorites.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="java.util.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Footer.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="java.security.Principal" %>
<%@ page import="java.util.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="java.security.Principal" %>
<%@ page import="java.text.MessageFormat" %>
<%@ page import="java.util.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/Header.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/InfoContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.permissions.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/LoginContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/NewGroupContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="java.security.Principal" %>
<%@ page import="java.util.Arrays" %>
<%@ page import="java.util.ResourceBundle" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsBottom.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageActionsTop.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PageTab.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp Thu Aug 15 19:29:11 2013
@@ -26,7 +26,7 @@
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.preferences.*" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreviewContent.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ProfileTab.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.user.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/SearchBox.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/UserBox.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/WorkflowContent.jsp Thu Aug 15 19:29:11 2013
@@ -19,7 +19,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ page import="org.apache.wiki.*" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp Thu Aug 15 19:29:11 2013
@@ -22,7 +22,7 @@
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.ui.admin.*" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<html>
<head>
<title>JSPWiki administration</title>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp Thu Aug 15 19:29:11 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="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/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: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/commonheader.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/FCK.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/FCK.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/FCK.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/FCK.jsp Thu Aug 15 19:29:11 2013
@@ -18,7 +18,7 @@
--%>
<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="java.util.Properties"%>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp Thu Aug 15 19:29:11 2013
@@ -18,7 +18,7 @@
--%>
<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.permissions.*" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp Thu Aug 15 19:29:11 2013
@@ -18,7 +18,7 @@
--%>
<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp Thu Aug 15 19:29:11 2013
@@ -17,7 +17,7 @@
under the License.
--%>
-<%@ taglib uri="http://incubator.apache.org/jspwiki/tags" prefix="wiki" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<% response.setContentType("text/plain; charset=UTF-8"); %>
<pre>
<wiki:InsertPage mode="plain"/>
Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1514451&r1=1514450&r2=1514451&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Thu Aug 15 19:29:11 2013
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
and built around standard J2EE components (Java, servlets, JSP).</description>
- <url>http://incubator.apache.org/jspwiki/</url>
+ <url>http://jspwiki.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>