jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dvit...@apache.org
Subject svn commit: r1655964 - in /jspwiki/trunk/jspwiki-war/src: main/webapp/WEB-INF/web.xml test/resources/WEB-INF/web.xml
Date Fri, 30 Jan 2015 08:50:59 GMT
Author: dvittor
Date: Fri Jan 30 08:50:59 2015
New Revision: 1655964

URL: http://svn.apache.org/r1655964
Log:
JSPWIKI-566: Removed JSON-RPC from web.xml servlet mappings

Modified:
    jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml
    jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml

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=1655964&r1=1655963&r2=1655964&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 Fri Jan 30 08:50:59 2015
@@ -69,7 +69,6 @@
        <url-pattern>/atom/*</url-pattern>
        <url-pattern>/RPCU/</url-pattern>
        <url-pattern>/RPC2/</url-pattern>
-       <url-pattern>/JSON-RPC</url-pattern>
    </filter-mapping>
    <filter-mapping>
        <filter-name>WikiJSPFilter</filter-name>
@@ -122,12 +121,6 @@
        </init-param>
    </servlet>
 
-   <!-- JSON AJAX API -->
-   <servlet>
-       <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
-       <servlet-class>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-class>
-   </servlet>
-   
     <!-- WikiAjaxDispatcherServlet -->
     <servlet>
         <servlet-name>WikiAjaxDispatcherServlet</servlet-name>
@@ -173,11 +166,6 @@
         <url-pattern>/admin/ajax/*</url-pattern>
     </servlet-mapping>
 
-   <servlet-mapping>
-       <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
-       <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.

Modified: jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml?rev=1655964&r1=1655963&r2=1655964&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml Fri Jan 30 08:50:59 2015
@@ -86,10 +86,6 @@
        <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>
@@ -142,12 +138,6 @@
            <param-value>wiki</param-value>
        </init-param>
    </servlet>
-
-   <!-- JSON AJAX API -->
-   <servlet>
-       <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
-       <servlet-class>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-class>
-   </servlet>
    
     <!-- WikiAjaxDispatcherServlet -->
     <servlet>
@@ -223,11 +213,6 @@
        <url-pattern>/admin/ajax/*</url-pattern>
    </servlet-mapping>
     
-   <servlet-mapping>
-       <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
-       <url-pattern>/JSON-RPC</url-pattern>
-   </servlet-mapping>
-
    <!-- This means that we don't have to use redirection
         from index.html anymore.  Yay! -->
    <welcome-file-list>



Mime
View raw message