roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1504845 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java webapp/WEB-INF/web.xml
Date Fri, 19 Jul 2013 11:41:42 GMT
Author: gmazza
Date: Fri Jul 19 11:41:41 2013
New Revision: 1504845

URL: http://svn.apache.org/r1504845
Log:
Simplified the web.xml servlet-mapping elements for Struts1 StrutsRedirectServlet and pre-Roller
3.0 RedirectServlet (Should we remove these two servlets today? It appears so)

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java
    roller/trunk/app/src/main/webapp/WEB-INF/web.xml

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java?rev=1504845&r1=1504844&r2=1504845&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java
Fri Jul 19 11:41:41 2013
@@ -71,7 +71,7 @@ public class RedirectServlet extends Htt
      * Handle GET requests.
      *
      * All we are doing is calculating the new url for the given resource and
-     * sending a 301 redirect to it's new location.
+     * sending a 301 redirect to its new location.
      */
     public void doGet(HttpServletRequest request, HttpServletResponse response) 
             throws ServletException, IOException {

Modified: roller/trunk/app/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/web.xml?rev=1504845&r1=1504844&r2=1504845&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/web.xml Fri Jul 19 11:41:41 2013
@@ -453,65 +453,20 @@
         <url-pattern>/roller-services/opensearch/*</url-pattern>
     </servlet-mapping>
 
-
     <!-- Redirect Support for pre-3.0 urls -->
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/language/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/comments/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/resources/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/rsd/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/flavor/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/rss/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/atom/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/page/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/search/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/xmlrpc/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/editor/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/admin/*</url-pattern>
     </servlet-mapping>
 
@@ -519,14 +474,9 @@
     <servlet-mapping>
         <servlet-name>StrutsRedirectServlet</servlet-name>
         <url-pattern>/roller-ui/yourWebsites.do</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>StrutsRedirectServlet</servlet-name>
         <url-pattern>/roller-ui/authoring/commentManagement.do</url-pattern>
     </servlet-mapping>
 
-
     <session-config>
         <session-timeout>30</session-timeout>
     </session-config>
@@ -552,7 +502,6 @@
         <location>/roller-ui/errors/404.jsp</location>
     </error-page>
 
-
     <!-- jndi resources -->
     <resource-ref>
         <res-ref-name>jdbc/rollerdb</res-ref-name>



Mime
View raw message