You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2019/07/04 09:10:40 UTC
[jspwiki] branch master updated: 2.11.0-M5-git-05: update web.xml
testcases
This is an automated email from the ASF dual-hosted git repository.
brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 858ef0f 2.11.0-M5-git-05: update web.xml testcases
858ef0f is described below
commit 858ef0f350a78c3653205eb0490ec6ed891b6d32
Author: brushed <di...@gmail.com>
AuthorDate: Thu Jul 4 11:10:27 2019 +0200
2.11.0-M5-git-05: update web.xml testcases
---
.../src/main/webapp/WEB-INF/web.xml | 68 +++++++++++-----------
.../src/main/webapp/WEB-INF/web.xml | 54 ++++++++---------
.../src/main/webapp/WEB-INF/web.xml | 28 ++++-----
.../src/main/webapp/WEB-INF/web.xml | 28 ++++-----
.../src/main/webapp/WEB-INF/web.xml | 26 ++++-----
5 files changed, 102 insertions(+), 102 deletions(-)
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml
index 3ccfdfe..80bec26 100644
--- a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml
@@ -15,13 +15,13 @@
"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.
+ under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="http://xmlns.jcp.org/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-app_2_5.xsd"
- version="2.5">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<description>
JSPWiki is an open source JSP-based WikiClone. It is licensed
@@ -83,7 +83,7 @@
<filter-mapping>
<filter-name>WikiServletFilter</filter-name>
<url-pattern>/JSON-RPC</url-pattern>
- </filter-mapping>
+ </filter-mapping>
<filter-mapping>
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>/wiki/*</url-pattern>
@@ -92,14 +92,14 @@
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
-
+
<!--
HttpSessionListener used for managing WikiSession's.
-->
<listener>
<listener-class>org.apache.wiki.auth.SessionMonitor</listener-class>
</listener>
-
+
<!--
Now, let's define the XML-RPC interfaces. You probably don't have to
touch these.
@@ -108,7 +108,7 @@
-->
<servlet>
<servlet-name>XMLRPC</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
@@ -126,7 +126,7 @@
<servlet>
<servlet-name>XMLRPC-UTF8</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
@@ -147,13 +147,13 @@
<!-- Atom Publishing Protocol -->
<servlet>
<servlet-name>ATOM</servlet-name>
- <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
+ <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
</servlet>
<!-- Maps short URLS to JSPs; also, detects webapp shutdown. -->
<servlet>
<servlet-name>WikiServlet</servlet-name>
- <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
+ <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -204,7 +204,7 @@
<servlet-name>WikiServlet</servlet-name>
<url-pattern>/wiki/*</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
<url-pattern>/JSON-RPC</url-pattern>
@@ -215,14 +215,14 @@
<welcome-file-list>
<welcome-file>Wiki.jsp</welcome-file>
</welcome-file-list>
-
+
<!-- Error pages -->
<error-page>
<error-code>403</error-code>
<location>/error/Forbidden.html</location>
</error-page>
-
+
<resource-ref>
<description>
Resource reference to JNDI factory for the JDBCUserDatabase.
@@ -251,7 +251,7 @@
Container
</res-auth>
</resource-ref>
-
+
<!-- REMOVE ME TO ENABLE JAVAMAIL
<resource-ref>
@@ -264,37 +264,37 @@
<!--
CONTAINER-MANAGED AUTHENTICATION & AUTHORIZATION
-
+
Here we define the users which are allowed to access JSPWiki.
- These restrictions cause the web container to apply further
+ These restrictions cause the web container to apply further
contraints to the default security policy in jspwiki.policy,
and should be suitable for a corporate intranet or public wiki.
In particular, the restrictions below allow all users to
read documents, but only Authenticated users can comment
on or edit them (i.e., access the Edit.jsp page).
- Users with the role Admin are the only persons who can
- delete pages.
+ Users with the role Admin are the only persons who can
+ delete pages.
To implement this policy, the container enforces two web
resource constraints: one for the Administrator resources,
- and one for Authenticated users. Note that the "role-name"
- values are significant and should match the role names
- retrieved by your web container's security realm. The roles
- of "Admin" and "Authenticated" are assigned by the web
+ and one for Authenticated users. Note that the "role-name"
+ values are significant and should match the role names
+ retrieved by your web container's security realm. The roles
+ of "Admin" and "Authenticated" are assigned by the web
container at login time.
For example, if you are using Tomcat's built-in "memory realm",
- you should edit the $CATALINA_HOME/conf/tomcat-users.xml file
+ you should edit the $CATALINA_HOME/conf/tomcat-users.xml file
and add the desired actual user accounts. Each user must possess
one or both of the Admin or Authenticated roles. For other realm
types, consult your web container's documentation.
-
- Alternatively, you could also replace all references to
- "Authenticated" and "Admin" with role names that match those
+
+ Alternatively, you could also replace all references to
+ "Authenticated" and "Admin" with role names that match those
returned by your container's security realm. We don't care
either way, as long as they match.
-
+
Note that accessing protected resources will cause your
container to try to use SSL (default port for Tomcat is 8443)
to secure the web session. This, of course, assumes your
@@ -303,8 +303,8 @@
elements.
-->
-
-
+
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Administrative Area</web-resource-name>
@@ -317,7 +317,7 @@
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Authenticated area</web-resource-name>
@@ -373,7 +373,7 @@
</description>
<role-name>Admin</role-name>
</security-role>
-
-
-
+
+
+
</web-app>
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml b/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml
index b2775c7..70acd52 100644
--- a/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml
@@ -15,13 +15,13 @@
"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.
+ under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="http://xmlns.jcp.org/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-app_2_5.xsd"
- version="2.5">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<description>
JSPWiki is an open source JSP-based WikiClone. It is licensed
@@ -83,7 +83,7 @@
<filter-mapping>
<filter-name>WikiServletFilter</filter-name>
<url-pattern>/JSON-RPC</url-pattern>
- </filter-mapping>
+ </filter-mapping>
<filter-mapping>
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>/wiki/*</url-pattern>
@@ -92,14 +92,14 @@
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
-
+
<!--
HttpSessionListener used for managing WikiSession's.
-->
<listener>
<listener-class>org.apache.wiki.auth.SessionMonitor</listener-class>
</listener>
-
+
<!--
Now, let's define the XML-RPC interfaces. You probably don't have to
touch these.
@@ -108,7 +108,7 @@
-->
<servlet>
<servlet-name>XMLRPC</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
@@ -126,7 +126,7 @@
<servlet>
<servlet-name>XMLRPC-UTF8</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
@@ -147,13 +147,13 @@
<!-- Atom Publishing Protocol -->
<servlet>
<servlet-name>ATOM</servlet-name>
- <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
+ <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
</servlet>
<!-- Maps short URLS to JSPs; also, detects webapp shutdown. -->
<servlet>
<servlet-name>WikiServlet</servlet-name>
- <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
+ <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -175,7 +175,7 @@
<servlet-name>WikiServlet</servlet-name>
<url-pattern>/wiki/*</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
<url-pattern>/JSON-RPC</url-pattern>
@@ -186,7 +186,7 @@
<welcome-file-list>
<welcome-file>Wiki.jsp</welcome-file>
</welcome-file-list>
-
+
<!-- Error pages -->
<error-page>
<error-code>403</error-code>
@@ -195,37 +195,37 @@
<!--
CONTAINER-MANAGED AUTHENTICATION & AUTHORIZATION
-
+
Here we define the users which are allowed to access JSPWiki.
- These restrictions cause the web container to apply further
+ These restrictions cause the web container to apply further
constraints to the default security policy in jspwiki.policy,
and should be suitable for a corporate intranet or public wiki.
In particular, the restrictions below allow all users to
read documents, but only Authenticated users can comment
on or edit them (i.e., access the Edit.jsp page).
- Users with the role Admin are the only persons who can
- delete pages.
+ Users with the role Admin are the only persons who can
+ delete pages.
To implement this policy, the container enforces two web
resource constraints: one for the Administrator resources,
- and one for Authenticated users. Note that the "role-name"
- values are significant and should match the role names
- retrieved by your web container's security realm. The roles
- of "Admin" and "Authenticated" are assigned by the web
+ and one for Authenticated users. Note that the "role-name"
+ values are significant and should match the role names
+ retrieved by your web container's security realm. The roles
+ of "Admin" and "Authenticated" are assigned by the web
container at login time.
For example, if you are using Tomcat's built-in "memory realm",
- you should edit the $CATALINA_HOME/conf/tomcat-users.xml file
+ you should edit the $CATALINA_HOME/conf/tomcat-users.xml file
and add the desired actual user accounts. Each user must possess
one or both of the Admin or Authenticated roles. For other realm
types, consult your web container's documentation.
-
- Alternatively, you could also replace all references to
- "Authenticated" and "Admin" with role names that match those
+
+ Alternatively, you could also replace all references to
+ "Authenticated" and "Admin" with role names that match those
returned by your container's security realm. We don't care
either way, as long as they match.
-
+
Note that accessing protected resources will cause your
container to try to use SSL (default port for Tomcat is 8443)
to secure the web session. This, of course, assumes your
@@ -246,7 +246,7 @@
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Authenticated area</web-resource-name>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
index bb0606b..ea15081 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
@@ -15,13 +15,13 @@
"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.
+ under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="http://xmlns.jcp.org/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-app_2_5.xsd"
- version="2.5">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<description>
JSPWiki is an open source JSP-based WikiClone. It is licensed
@@ -83,7 +83,7 @@
<filter-mapping>
<filter-name>WikiServletFilter</filter-name>
<url-pattern>/JSON-RPC</url-pattern>
- </filter-mapping>
+ </filter-mapping>
<filter-mapping>
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>/wiki/*</url-pattern>
@@ -92,14 +92,14 @@
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
-
+
<!--
HttpSessionListener used for managing WikiSession's.
-->
<listener>
<listener-class>org.apache.wiki.auth.SessionMonitor</listener-class>
</listener>
-
+
<!--
Now, let's define the XML-RPC interfaces. You probably don't have to
touch these.
@@ -108,7 +108,7 @@
-->
<servlet>
<servlet-name>XMLRPC</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
@@ -126,7 +126,7 @@
<servlet>
<servlet-name>XMLRPC-UTF8</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
@@ -147,13 +147,13 @@
<!-- Atom Publishing Protocol -->
<servlet>
<servlet-name>ATOM</servlet-name>
- <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
+ <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
</servlet>
<!-- Maps short URLS to JSPs; also, detects webapp shutdown. -->
<servlet>
<servlet-name>WikiServlet</servlet-name>
- <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
+ <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -204,7 +204,7 @@
<servlet-name>WikiServlet</servlet-name>
<url-pattern>/wiki/*</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
<url-pattern>/JSON-RPC</url-pattern>
@@ -215,13 +215,13 @@
<welcome-file-list>
<welcome-file>Wiki.jsp</welcome-file>
</welcome-file-list>
-
+
<!-- Error pages -->
<error-page>
<error-code>403</error-code>
<location>/error/Forbidden.html</location>
</error-page>
-
+
<resource-ref>
<description>
Resource reference to JNDI factory for the JDBCUserDatabase.
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
index bb0606b..ea15081 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
@@ -15,13 +15,13 @@
"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.
+ under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="http://xmlns.jcp.org/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-app_2_5.xsd"
- version="2.5">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<description>
JSPWiki is an open source JSP-based WikiClone. It is licensed
@@ -83,7 +83,7 @@
<filter-mapping>
<filter-name>WikiServletFilter</filter-name>
<url-pattern>/JSON-RPC</url-pattern>
- </filter-mapping>
+ </filter-mapping>
<filter-mapping>
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>/wiki/*</url-pattern>
@@ -92,14 +92,14 @@
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
-
+
<!--
HttpSessionListener used for managing WikiSession's.
-->
<listener>
<listener-class>org.apache.wiki.auth.SessionMonitor</listener-class>
</listener>
-
+
<!--
Now, let's define the XML-RPC interfaces. You probably don't have to
touch these.
@@ -108,7 +108,7 @@
-->
<servlet>
<servlet-name>XMLRPC</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
@@ -126,7 +126,7 @@
<servlet>
<servlet-name>XMLRPC-UTF8</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
@@ -147,13 +147,13 @@
<!-- Atom Publishing Protocol -->
<servlet>
<servlet-name>ATOM</servlet-name>
- <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
+ <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
</servlet>
<!-- Maps short URLS to JSPs; also, detects webapp shutdown. -->
<servlet>
<servlet-name>WikiServlet</servlet-name>
- <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
+ <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -204,7 +204,7 @@
<servlet-name>WikiServlet</servlet-name>
<url-pattern>/wiki/*</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
<url-pattern>/JSON-RPC</url-pattern>
@@ -215,13 +215,13 @@
<welcome-file-list>
<welcome-file>Wiki.jsp</welcome-file>
</welcome-file-list>
-
+
<!-- Error pages -->
<error-page>
<error-code>403</error-code>
<location>/error/Forbidden.html</location>
</error-page>
-
+
<resource-ref>
<description>
Resource reference to JNDI factory for the JDBCUserDatabase.
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml b/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml
index 8f1a10c..ea15081 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml
@@ -15,13 +15,13 @@
"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.
+ under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="http://xmlns.jcp.org/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-app_2_5.xsd"
- version="2.5">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<description>
JSPWiki is an open source JSP-based WikiClone. It is licensed
@@ -83,7 +83,7 @@
<filter-mapping>
<filter-name>WikiServletFilter</filter-name>
<url-pattern>/JSON-RPC</url-pattern>
- </filter-mapping>
+ </filter-mapping>
<filter-mapping>
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>/wiki/*</url-pattern>
@@ -92,14 +92,14 @@
<filter-name>WikiJSPFilter</filter-name>
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
-
+
<!--
HttpSessionListener used for managing WikiSession's.
-->
<listener>
<listener-class>org.apache.wiki.auth.SessionMonitor</listener-class>
</listener>
-
+
<!--
Now, let's define the XML-RPC interfaces. You probably don't have to
touch these.
@@ -108,7 +108,7 @@
-->
<servlet>
<servlet-name>XMLRPC</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
@@ -126,7 +126,7 @@
<servlet>
<servlet-name>XMLRPC-UTF8</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
@@ -147,13 +147,13 @@
<!-- Atom Publishing Protocol -->
<servlet>
<servlet-name>ATOM</servlet-name>
- <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
+ <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
</servlet>
<!-- Maps short URLS to JSPs; also, detects webapp shutdown. -->
<servlet>
<servlet-name>WikiServlet</servlet-name>
- <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
+ <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -204,7 +204,7 @@
<servlet-name>WikiServlet</servlet-name>
<url-pattern>/wiki/*</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
<url-pattern>/JSON-RPC</url-pattern>
@@ -215,7 +215,7 @@
<welcome-file-list>
<welcome-file>Wiki.jsp</welcome-file>
</welcome-file-list>
-
+
<!-- Error pages -->
<error-page>
<error-code>403</error-code>