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 d1569d6974ef0ba346cf40dc963250fdb453f1bb Author: Juergen Weber <[email protected]> AuthorDate: Tue Apr 15 21:55:24 2025 +0200 moved xmlrpc to web-fragment --- jspwiki-war/src/main/webapp/WEB-INF/web.xml | 62 +-------------- .../src/main/resources/META-INF/web-fragment.xml | 90 ++++++++++++++++++++++ 2 files changed, 91 insertions(+), 61 deletions(-) diff --git a/jspwiki-war/src/main/webapp/WEB-INF/web.xml b/jspwiki-war/src/main/webapp/WEB-INF/web.xml index c504ec15d..fb024da25 100644 --- a/jspwiki-war/src/main/webapp/WEB-INF/web.xml +++ b/jspwiki-war/src/main/webapp/WEB-INF/web.xml @@ -99,43 +99,6 @@ <listener-class>org.apache.wiki.bootstrap.WikiBootstrapServletContextListener</listener-class> </listener> - <!-- - Now, let's define the XML-RPC interfaces. You probably don't have to - touch these. - - First, we'll define the standard XML-RPC interface. - --> - <servlet> - <servlet-name>XMLRPC</servlet-name> - <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> - </init-param> - - <init-param> - <param-name>prefix</param-name> - <param-value>wiki</param-value> - </init-param> - </servlet> - - <!-- - OK, this then defines that our UTF-8 -capable server. - --> - - <servlet> - <servlet-name>XMLRPC-UTF8</servlet-name> - <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> - </init-param> - - <init-param> - <param-name>prefix</param-name> - <param-value>wiki</param-value> - </init-param> - </servlet> <!-- WikiAjaxDispatcherServlet --> <servlet> @@ -182,30 +145,7 @@ <url-pattern>/admin/ajax/*</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> diff --git a/jspwiki-xmlrpc/src/main/resources/META-INF/web-fragment.xml b/jspwiki-xmlrpc/src/main/resources/META-INF/web-fragment.xml new file mode 100644 index 000000000..13fde7c8d --- /dev/null +++ b/jspwiki-xmlrpc/src/main/resources/META-INF/web-fragment.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"; + version="3.0"> + + + <!-- + Now, let's define the XML-RPC interfaces. You probably don't have to + touch these. + + First, we'll define the standard XML-RPC interface. + --> + <servlet> + <servlet-name>XMLRPC</servlet-name> + <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> + </init-param> + + <init-param> + <param-name>prefix</param-name> + <param-value>wiki</param-value> + </init-param> + </servlet> + + <!-- + OK, this then defines that our UTF-8 -capable server. + --> + + <servlet> + <servlet-name>XMLRPC-UTF8</servlet-name> + <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> + </init-param> + + <init-param> + <param-name>prefix</param-name> + <param-value>wiki</param-value> + </init-param> + </servlet> + + <!-- + 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 --> + + +</web-fragment> \ No newline at end of file
