This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 84740147ab1dd72a1ca6857f35d1b4313d4fc9aa Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Tue Jul 12 22:50:23 2022 +0200 format web.xml files --- .../src/main/webapp/WEB-INF/web.xml | 58 ++++++++-------------- .../src/main/webapp/WEB-INF/web.xml | 58 ++++++++-------------- .../src/main/webapp/WEB-INF/web.xml | 58 ++++++++-------------- .../src/main/webapp/WEB-INF/web.xml | 58 ++++++++-------------- .../src/main/webapp/WEB-INF/web.xml | 58 ++++++++-------------- jspwiki-war/src/main/webapp/WEB-INF/web.xml | 24 ++++----- 6 files changed, 117 insertions(+), 197 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 6be2a4d9f..beb8a27e2 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 @@ -55,43 +55,27 @@ possesses the correct "assertion cookie." --> - <filter> - <filter-name>WikiServletFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> - </filter> - <filter> - <filter-name>WikiJSPFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> - </filter> - - <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>*.jsp</url-pattern> - </filter-mapping> + <filter> + <filter-name>WikiServletFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> + </filter> + <filter> + <filter-name>WikiJSPFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>WikiServletFilter</filter-name> + <url-pattern>/attach/*</url-pattern> + <url-pattern>/atom/*</url-pattern> + <url-pattern>/RPCU/</url-pattern> + <url-pattern>/RPC2/</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. 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 085b383e8..393a8430e 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 @@ -55,43 +55,27 @@ possesses the correct "assertion cookie." --> - <filter> - <filter-name>WikiServletFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> - </filter> - <filter> - <filter-name>WikiJSPFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> - </filter> - - <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>*.jsp</url-pattern> - </filter-mapping> + <filter> + <filter-name>WikiServletFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> + </filter> + <filter> + <filter-name>WikiJSPFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>WikiServletFilter</filter-name> + <url-pattern>/attach/*</url-pattern> + <url-pattern>/atom/*</url-pattern> + <url-pattern>/RPCU/</url-pattern> + <url-pattern>/RPC2/</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. 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 c4c37d594..9937d26bb 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 @@ -55,43 +55,27 @@ possesses the correct "assertion cookie." --> - <filter> - <filter-name>WikiServletFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> - </filter> - <filter> - <filter-name>WikiJSPFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> - </filter> - - <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>*.jsp</url-pattern> - </filter-mapping> + <filter> + <filter-name>WikiServletFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> + </filter> + <filter> + <filter-name>WikiJSPFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>WikiServletFilter</filter-name> + <url-pattern>/attach/*</url-pattern> + <url-pattern>/atom/*</url-pattern> + <url-pattern>/RPCU/</url-pattern> + <url-pattern>/RPC2/</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. 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 c4c37d594..9937d26bb 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 @@ -55,43 +55,27 @@ possesses the correct "assertion cookie." --> - <filter> - <filter-name>WikiServletFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> - </filter> - <filter> - <filter-name>WikiJSPFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> - </filter> - - <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>*.jsp</url-pattern> - </filter-mapping> + <filter> + <filter-name>WikiServletFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> + </filter> + <filter> + <filter-name>WikiJSPFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>WikiServletFilter</filter-name> + <url-pattern>/attach/*</url-pattern> + <url-pattern>/atom/*</url-pattern> + <url-pattern>/RPCU/</url-pattern> + <url-pattern>/RPC2/</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. 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 c4c37d594..9937d26bb 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 @@ -55,43 +55,27 @@ possesses the correct "assertion cookie." --> - <filter> - <filter-name>WikiServletFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> - </filter> - <filter> - <filter-name>WikiJSPFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> - </filter> - - <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>*.jsp</url-pattern> - </filter-mapping> + <filter> + <filter-name>WikiServletFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> + </filter> + <filter> + <filter-name>WikiJSPFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>WikiServletFilter</filter-name> + <url-pattern>/attach/*</url-pattern> + <url-pattern>/atom/*</url-pattern> + <url-pattern>/RPCU/</url-pattern> + <url-pattern>/RPC2/</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. diff --git a/jspwiki-war/src/main/webapp/WEB-INF/web.xml b/jspwiki-war/src/main/webapp/WEB-INF/web.xml index ed7374354..761708dc8 100644 --- a/jspwiki-war/src/main/webapp/WEB-INF/web.xml +++ b/jspwiki-war/src/main/webapp/WEB-INF/web.xml @@ -66,25 +66,25 @@ --> <filter> - <filter-name>WikiServletFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> + <filter-name>WikiServletFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class> </filter> <filter> - <filter-name>WikiJSPFilter</filter-name> - <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> + <filter-name>WikiJSPFilter</filter-name> + <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class> </filter> <filter-mapping> - <filter-name>WikiServletFilter</filter-name> - <url-pattern>/attach/*</url-pattern> - <url-pattern>/atom/*</url-pattern> - <url-pattern>/RPCU/</url-pattern> - <url-pattern>/RPC2/</url-pattern> + <filter-name>WikiServletFilter</filter-name> + <url-pattern>/attach/*</url-pattern> + <url-pattern>/atom/*</url-pattern> + <url-pattern>/RPCU/</url-pattern> + <url-pattern>/RPC2/</url-pattern> </filter-mapping> <filter-mapping> - <filter-name>WikiJSPFilter</filter-name> - <url-pattern>/wiki/*</url-pattern> - <url-pattern>*.jsp</url-pattern> + <filter-name>WikiJSPFilter</filter-name> + <url-pattern>/wiki/*</url-pattern> + <url-pattern>*.jsp</url-pattern> </filter-mapping> <!--
