[MMBASE SCM] r41129 - in CMSContainer/trunk/CMSContainer_Templates/double: war-live/src/webapp/WEB-INF war-staging/src/webapp/WEB-INF

[jkoster]

Author: jkoster
Date: 2010-02-18 11:51:10 +0100 (Thu, 18 Feb 2010)
New Revision: 41129

Modified:
   
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/web.xml
   
CMSContainer/trunk/CMSContainer_Templates/double/war-staging/src/webapp/WEB-INF/web.xml
Log:
CMSC-1330 - Don't specify frameworkfilter twice. Fix typo.

Modified: 
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/web.xml
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/web.xml
        2010-02-18 10:43:40 UTC (rev 41128)
+++ 
CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/web.xml
        2010-02-18 10:51:10 UTC (rev 41129)
@@ -25,7 +25,7 @@
        <!-- 
                Whether the mm:url tag (and other URL producing tags) should 
produce relative URL's (relative to
                the page on which the mm:url is called).  You might try to set 
this to 'true' if you desire only
-               relative urls in your site. This is an expirimental option, 
which is known not to work in
+               relative urls in your site. This is an experimental option, 
which is known not to work in
                certain situations (like redirects).
        -->
        <context-param>
@@ -123,15 +123,6 @@
       </init-param>
    </filter>
    
-   <filter>
-      <filter-name>FrameworkFilter</filter-name>
-      <filter-class>org.mmbase.framework.FrameworkFilter</filter-class>
-      <init-param>
-         <param-name>excludes</param-name>
-         
<param-value>([.]ico$|[.]jpg$|[.]gif$|[.]png$|[.]css$|[.]js$|[.]jsp$|[.]do$)|/errorpages|/editors</param-value>
-      </init-param>
-   </filter>   
-   
    <filter-mapping>
       <filter-name>DisableUrlSessionFilter</filter-name>
       <url-pattern>/*</url-pattern>

Modified: 
CMSContainer/trunk/CMSContainer_Templates/double/war-staging/src/webapp/WEB-INF/web.xml
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Templates/double/war-staging/src/webapp/WEB-INF/web.xml
     2010-02-18 10:43:40 UTC (rev 41128)
+++ 
CMSContainer/trunk/CMSContainer_Templates/double/war-staging/src/webapp/WEB-INF/web.xml
     2010-02-18 10:51:10 UTC (rev 41129)
@@ -25,7 +25,7 @@
        <!-- 
                Whether the mm:url tag (and other URL producing tags) should 
produce relative URL's (relative to
                the page on which the mm:url is called).  You might try to set 
this to 'true' if you desire only
-               relative urls in your site. This is an expirimental option, 
which is known not to work in
+               relative urls in your site. This is an experimental option, 
which is known not to work in
                certain situations (like redirects).
        -->
        <context-param>
@@ -145,15 +145,6 @@
       </init-param>
    </filter>
    
-   <filter>
-      <filter-name>FrameworkFilter</filter-name>
-      <filter-class>org.mmbase.framework.FrameworkFilter</filter-class>
-      <init-param>
-         <param-name>excludes</param-name>
-         
<param-value>([.]ico$|[.]jpg$|[.]gif$|[.]png$|[.]css$|[.]js$|[.]jsp$|[.]do$)|/errorpages|/editors</param-value>
-      </init-param>
-   </filter>   
-   
    <filter-mapping>
       <filter-name>DisableUrlSessionFilter</filter-name>
       <url-pattern>/*</url-pattern>

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs