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 [2/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...

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

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp Thu Jul 11 19:40:18 2013
@@ -18,7 +18,7 @@
 --%>
 
 <%@ page language="java" import="java.util.*" pageEncoding="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.*" %>
 <%@ page import="org.apache.wiki.auth.permissions.*" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/editors/preview.jsp Thu Jul 11 19:40:18 2013
@@ -18,7 +18,7 @@
 --%>
 
 <%@ page language="java" pageEncoding="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.ui.*" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/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" %>
 <% response.setContentType("text/plain; charset=UTF-8"); %>
 <pre>
 <wiki:InsertPage mode="plain"/>

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1502339&r1=1502338&r2=1502339&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Thu Jul 11 19:40:18 2013
@@ -230,14 +230,14 @@
       <dependency>
         <groupId>javax.servlet.jsp</groupId>
         <artifactId>jsp-api</artifactId>
-        <version>2.0</version>
+        <version>2.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
-        <version>2.4</version>
+        <version>2.5</version>
         <scope>provided</scope>
       </dependency>