Author: kbettinger Date: 2010-02-02 13:05:07 +0100 (Tue, 02 Feb 2010) New Revision: 40779
Modified: CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml Log: CMSC-1565 Modified: CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml 2010-02-02 09:22:52 UTC (rev 40778) +++ CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml 2010-02-02 12:05:07 UTC (rev 40779) @@ -1,37 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> -<web-app xmlns="http://java.sun.com/xml/ns/j2ee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; - version="2.4"> - - <display-name>CMS Container implementation</display-name> - <description>CMS Container implementation</description> +<web-app xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; + version="2.4"> -<!-- - <listener> - <listener-class>net.jforum.ForumSessionListener</listener-class> - </listener> ---> + <display-name>CMS Container implementation</display-name> + <description>CMS Container implementation</description> + + <!-- + <listener> + <listener-class>net.jforum.ForumSessionListener</listener-class> + </listener> + --> <!-- MMBase Taglib settings --> - <!-- - Whether tags should try to evaluate the body without buffering if that is possible. This feature - of taglibs is not supported by all applications servers (orion, tomcat < 4.1.19?), in which case - setting this to true will cause rather strange results. - If your application server does support this well (resin 3, tomcat 5), you can set this to true, - and improve performance. + <!-- + Whether tags should try to evaluate the body without buffering if that + is possible. This feature of taglibs is not supported by all + applications servers (orion, tomcat < 4.1.19?), in which case setting + this to true will cause rather strange results. If your application + server does support this well (resin 3, tomcat 5), you can set this to + true, and improve performance. --> <context-param> <param-name>mmbase.taglib.eval_body_include</param-name> <param-value>true</param-value> </context-param> - <!-- - 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 experimental option, which is known not to work in - certain situations (like redirects). + <!-- + 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 experimental option, which is known not to + work in certain situations (like redirects). --> <context-param> <param-name>mmbase.taglib.url.makerelative</param-name> @@ -42,28 +43,21 @@ <param-name>cmsc.portal.aggregation.base.dir</param-name> <param-value>/WEB-INF/templates/</param-value> </context-param> -<!-- Default settings for template locations - <context-param> + <!-- + Default settings for template locations <context-param> <param-name>cmsc.portal.layout.base.dir</param-name> - <param-value>/WEB-INF/templates/layout/</param-value> - </context-param> - <context-param> - <param-name>cmsc.portal.view.base.dir</param-name> - <param-value>/WEB-INF/templates/view/</param-value> - </context-param> - <context-param> - <param-name>cmsc.portal.edit.base.dir</param-name> - <param-value>/WEB-INF/templates/edit/</param-value> - </context-param> - <context-param> + <param-value>/WEB-INF/templates/layout/</param-value> </context-param> + <context-param> <param-name>cmsc.portal.view.base.dir</param-name> + <param-value>/WEB-INF/templates/view/</param-value> </context-param> + <context-param> <param-name>cmsc.portal.edit.base.dir</param-name> + <param-value>/WEB-INF/templates/edit/</param-value> </context-param> + <context-param> <param-name>cmsc.portal.edit_default.base.dir</param-name> <param-value>/WEB-INF/templates/edit_default/</param-value> - </context-param> - <context-param> + </context-param> <context-param> <param-name>cmsc.portal.help.base.dir</param-name> - <param-value>/WEB-INF/templates/help/</param-value> - </context-param> ---> + <param-value>/WEB-INF/templates/help/</param-value> </context-param> + --> <context-param> <param-name>cmsc.portal.portlet.header.jsp</param-name> <param-value>PortletFragmentHeader.jsp</param-value> @@ -73,174 +67,174 @@ <param-value>PortletFragmentFooter.jsp</param-value> </context-param> - <!-- - The MMBase taglib stores its variable compatible with EL. If you don't want that (e.g. because - it was not like this in MMBase 1.7) then you can set this parameter to 'true' + <!-- + The MMBase taglib stores its variable compatible with EL. If you don't + want that (e.g. because it was not like this in MMBase 1.7) then you + can set this parameter to 'true' --> - <!-- context-param> - <param-name>mmbase.taglib.isELIgnored</param-name> - <param-value>false</param-value> - </context-param --> + <!-- + context-param> <param-name>mmbase.taglib.isELIgnored</param-name> + <param-value>false</param-value> </context-param + --> - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>/WEB-INF/spring-*.xml</param-value> - </context-param> - - <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> - </listener> + <context-param> + <param-name>contextConfigLocation</param-name> + <param-value>/WEB-INF/spring-*.xml</param-value> + </context-param> - <filter> - <filter-name>SecurityFilterChainProxy</filter-name> - <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class> - <init-param> - <param-name>targetClass</param-name> - <param-value>org.acegisecurity.util.FilterChainProxy</param-value> - </init-param> - </filter> - <filter-mapping> - <filter-name>SecurityFilterChainProxy</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter> - <description>Filter catch all requests.</description> - <display-name>DisableUrlSession Filter</display-name> - <filter-name>DisableUrlSessionFilter</filter-name> - <filter-class>com.finalist.cmsc.filters.DisableUrlSessionFilter</filter-class> - </filter> + <listener> + <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> + </listener> - <filter> - <description>Filter catch all requests.</description> - <display-name>CloudThread Filter</display-name> - <filter-name>CloudThreadFilter</filter-name> - <filter-class>org.mmbase.servlet.CloudThreadFilter</filter-class> - </filter> + <filter> + <filter-name>SecurityFilterChainProxy</filter-name> + <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class> + <init-param> + <param-name>targetClass</param-name> + <param-value>org.acegisecurity.util.FilterChainProxy</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>SecurityFilterChainProxy</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> - <filter> - <description>Set Character encoding for request parameters.</description> - <display-name>Set Character Encoding Filter</display-name> - <filter-name>CharacterEncoding</filter-name> - <filter-class>org.mmbase.servlet.CharacterEncodingFilter</filter-class> - <init-param> - <param-name>encoding</param-name> - <param-value>UTF-8</param-value> - </init-param> - </filter> + <filter> + <description>Filter catch all requests.</description> + <display-name>DisableUrlSession Filter</display-name> + <filter-name>DisableUrlSessionFilter</filter-name> + <filter-class>com.finalist.cmsc.filters.DisableUrlSessionFilter</filter-class> + </filter> + + <filter> + <description>Filter catch all requests.</description> + <display-name>CloudThread Filter</display-name> + <filter-name>CloudThreadFilter</filter-name> + <filter-class>org.mmbase.servlet.CloudThreadFilter</filter-class> + </filter> + + <filter> + <description>Set Character encoding for request parameters.</description> + <display-name>Set Character Encoding Filter</display-name> + <filter-name>CharacterEncoding</filter-name> + <filter-class>org.mmbase.servlet.CharacterEncodingFilter</filter-class> + <init-param> + <param-name>encoding</param-name> + <param-value>UTF-8</param-value> + </init-param> + </filter> <!--JavaEE authentication for Community Module--> - <filter> - <filter-name>PortalFilter</filter-name> - <filter-class>com.finalist.cmsc.login.filter.PortalFilter</filter-class> - </filter> + <filter> + <filter-name>PortalFilter</filter-name> + <filter-class>com.finalist.cmsc.login.filter.PortalFilter</filter-class> + </filter> <!-- --> - <!-- navigation controller --> - <filter> - <description>Filter catch all requests.</description> - <display-name>Controller Filter</display-name> - <filter-name>ControllerFilter</filter-name> - <filter-class>com.finalist.cmsc.portalImpl.ControllerFilter</filter-class> - <init-param> - <param-name>excludes</param-name> - <param-value>([.]jpg$|[.]gif$|[.]png$|[.]css$|[.]js$|[.]jsp$|[.]html$|[.]do$|[.]ico$)|robots.txt|/mmbase|/editors</param-value> - </init-param> - </filter> + <!-- navigation controller --> + <filter> + <description>Filter catch all requests.</description> + <display-name>Controller Filter</display-name> + <filter-name>ControllerFilter</filter-name> + <filter-class>com.finalist.cmsc.portalImpl.ControllerFilter</filter-class> + <init-param> + <param-name>excludes</param-name> + <param-value>([.]jpg$|[.]gif$|[.]png$|[.]css$|[.]js$|[.]jsp$|[.]html$|[.]do$|[.]ico$)|robots.txt|/mmbase|/editors</param-value> + </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> + <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> -<!-- Clickstream - <filter> - <filter-name>clickstream-jforum</filter-name> - <filter-class>net.jforum.util.legacy.clickstream.ClickstreamFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>clickstream-jforum</filter-name> - <url-pattern>*.page</url-pattern> - </filter-mapping> ---> - - <filter-mapping> - <filter-name>DisableUrlSessionFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>CloudThreadFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> + <!-- + Clickstream <filter> <filter-name>clickstream-jforum</filter-name> + <filter-class>net.jforum.util.legacy.clickstream.ClickstreamFilter</filter-class> + </filter> <filter-mapping> + <filter-name>clickstream-jforum</filter-name> + <url-pattern>*.page</url-pattern> </filter-mapping> + --> - <filter-mapping> - <filter-name>CharacterEncoding</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - + <filter-mapping> + <filter-name>DisableUrlSessionFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>CloudThreadFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>CharacterEncoding</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <!--JavaEE authentication for Community Module--> - <filter-mapping> - <filter-name>PortalFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>ControllerFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>FrameworkFilter</filter-name> - <url-pattern>/mmbase/*</url-pattern> - </filter-mapping> - - <servlet> - <display-name>Pluto Driver</display-name> - <servlet-name>CmscPortalServlet</servlet-name> - <servlet-class>com.finalist.cmsc.portalImpl.PortalServlet</servlet-class> - <init-param> - <param-name>charset</param-name> - <param-value>utf-8</param-value> - </init-param> - <load-on-startup>4</load-on-startup> - </servlet> + <filter-mapping> + <filter-name>PortalFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> - <servlet> - <description>All portlets are handled through this servlet.</description> - <display-name>Portlet servlet</display-name> - <servlet-name>CmscPortletServlet</servlet-name> - <servlet-class>com.finalist.cmsc.portalImpl.PortletServlet</servlet-class> - <load-on-startup>3</load-on-startup> - </servlet> + <filter-mapping> + <filter-name>ControllerFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> - <servlet> - <display-name>Pluto Driver</display-name> - <servlet-name>CmscPortalErrorServlet</servlet-name> - <servlet-class>com.finalist.cmsc.portalImpl.PortalErrorServlet</servlet-class> - <init-param> - <param-name>charset</param-name> - <param-value>utf-8</param-value> - </init-param> - <load-on-startup>4</load-on-startup> - </servlet> + <filter-mapping> + <filter-name>FrameworkFilter</filter-name> + <url-pattern>/mmbase/*</url-pattern> + </filter-mapping> - - <servlet> - <display-name>Redirect</display-name> - <servlet-name>CmscRedirectServlet</servlet-name> - <servlet-class>com.finalist.cmsc.services.search.RedirectServlet</servlet-class> - <init-param> + <servlet> + <display-name>Pluto Driver</display-name> + <servlet-name>CmscPortalServlet</servlet-name> + <servlet-class>com.finalist.cmsc.portalImpl.PortalServlet</servlet-class> + <init-param> + <param-name>charset</param-name> + <param-value>utf-8</param-value> + </init-param> + <load-on-startup>4</load-on-startup> + </servlet> + + <servlet> + <description>All portlets are handled through this servlet.</description> + <display-name>Portlet servlet</display-name> + <servlet-name>CmscPortletServlet</servlet-name> + <servlet-class>com.finalist.cmsc.portalImpl.PortletServlet</servlet-class> + <load-on-startup>3</load-on-startup> + </servlet> + + <servlet> + <display-name>Pluto Driver</display-name> + <servlet-name>CmscPortalErrorServlet</servlet-name> + <servlet-class>com.finalist.cmsc.portalImpl.PortalErrorServlet</servlet-class> + <init-param> + <param-name>charset</param-name> + <param-value>utf-8</param-value> + </init-param> + <load-on-startup>4</load-on-startup> + </servlet> + + + <servlet> + <display-name>Redirect</display-name> + <servlet-name>CmscRedirectServlet</servlet-name> + <servlet-class>com.finalist.cmsc.services.search.RedirectServlet</servlet-class> + <init-param> <param-name>forwardRequest</param-name> <param-value>true</param-value> - </init-param> - <load-on-startup>4</load-on-startup> - </servlet> - - <!-- The base MMBase servlet informs about the current MMBase version --> + </init-param> + <load-on-startup>4</load-on-startup> + </servlet> + + <!-- + The base MMBase servlet informs about the current MMBase version + --> <servlet> <servlet-name>version</servlet-name> <servlet-class>org.mmbase.servlet.MMBaseServlet</servlet-class> @@ -278,9 +272,7 @@ <!-- The MMBase attachment serving servlet. --> <servlet> <servlet-name>attachments</servlet-name> - <servlet-class> - org.mmbase.servlet.AttachmentServlet - </servlet-class> + <servlet-class>org.mmbase.servlet.AttachmentServlet</servlet-class> <init-param> <!-- Expire time of original images. Cached images never expire. --> <param-name>expire</param-name> @@ -298,9 +290,7 @@ <!-- Standard Action Servlet Configuration (with debugging) --> <servlet> <servlet-name>action</servlet-name> - <servlet-class> - com.finalist.cmsc.struts.ActionServlet - </servlet-class> + <servlet-class>com.finalist.cmsc.struts.ActionServlet</servlet-class> <init-param> <param-name>debug</param-name> <param-value>2</param-value> @@ -324,35 +314,45 @@ </servlet> <!-- JForum Controller --> - <servlet> - <servlet-name>jforum</servlet-name> - <servlet-class>net.jforum.JForum</servlet-class> - <init-param> - <param-name>development</param-name> - <param-value>true</param-value> - </init-param> - </servlet> - <!-- Installer --> - <!-- <servlet> - <servlet-name>install</servlet-name> - <servlet-class>net.jforum.InstallServlet</servlet-class> - <init-param> - <param-name>development</param-name> - <param-value>true</param-value> - </init-param> - </servlet> --> + <servlet> + <servlet-name>jforum</servlet-name> + <servlet-class>net.jforum.JForum</servlet-class> + <init-param> + <param-name>development</param-name> + <param-value>true</param-value> + </init-param> + </servlet> + <!-- Installer --> + <!-- + <servlet> <servlet-name>install</servlet-name> + <servlet-class>net.jforum.InstallServlet</servlet-class> <init-param> + <param-name>development</param-name> <param-value>true</param-value> + </init-param> </servlet> + --> - <!-- Mapping --> - <!--<servlet-mapping> - <servlet-name>install</servlet-name> - <url-pattern>/install/install.page</url-pattern> - </servlet-mapping> --> + <!-- Mapping --> + <!-- + <servlet-mapping> <servlet-name>install</servlet-name> + <url-pattern>/install/install.page</url-pattern> </servlet-mapping> + --> - <servlet-mapping> - <servlet-name>jforum</servlet-name> - <url-pattern>*.page</url-pattern> - </servlet-mapping> + <!-- CMSC-1565 --> + <servlet> + <description>Returns css text</description> + <servlet-name>stylesheet</servlet-name> + <servlet-class>com.finalist.cmsc.servlet.StylesheetServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>stylesheet</servlet-name> + <url-pattern>/stylesheet/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>jforum</servlet-name> + <url-pattern>*.page</url-pattern> + </servlet-mapping> + <servlet-mapping> <servlet-name>version</servlet-name> <url-pattern>/version</url-pattern> </servlet-mapping> @@ -366,7 +366,7 @@ <servlet-name>attachments</servlet-name> <url-pattern>/mmbase/attachments/*</url-pattern> </servlet-mapping> - + <servlet-mapping> <servlet-name>CmscRedirectServlet</servlet-name> <url-pattern>/content/*</url-pattern> @@ -411,10 +411,10 @@ </mime-mapping> <welcome-file-list> - <welcome-file>index.jspx</welcome-file> - <welcome-file>index.jsp</welcome-file> - <welcome-file>default.jsp</welcome-file> - <welcome-file>index.html</welcome-file> + <welcome-file>index.jspx</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.jsp</welcome-file> + <welcome-file>index.html</welcome-file> </welcome-file-list> <error-page> @@ -422,10 +422,10 @@ <location>/PortalError</location> </error-page> <!-- cloud login method http sends a 401 with an autheticate request --> - <!--error-page> - <error-code>401</error-code> - <location>/error/401.jsp</location> - </error-page--> + <!-- + error-page> <error-code>401</error-code> + <location>/error/401.jsp</location> </error-page + --> <error-page> <error-code>403</error-code> <location>/PortalError</location> @@ -456,7 +456,7 @@ <res-type>javax.sql.DataSource</res-type> <res-auth>Container</res-auth> </resource-ref> - + <env-entry> <description>MMbase CloudContext Security: allow all read operations on nodes</description> <env-entry-name>mmbase-builders/mmbasecontexts/readall</env-entry-name> Modified: CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml 2010-02-02 09:22:52 UTC (rev 40778) +++ CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml 2010-02-02 12:05:07 UTC (rev 40779) @@ -273,7 +273,18 @@ <servlet-class>com.finalist.cmsc.repository.xml.XMLServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> + + <!-- CMSC-1565 --> + <servlet> + <description>Returns css text</description> + <servlet-name>stylesheet</servlet-name> + <servlet-class>com.finalist.cmsc.servlet.StylesheetServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>stylesheet</servlet-name> + <url-pattern>/stylesheet/*</url-pattern> + </servlet-mapping> <servlet-mapping> <servlet-name>version</servlet-name> Modified: CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml 2010-02-02 09:22:52 UTC (rev 40778) +++ CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml 2010-02-02 12:05:07 UTC (rev 40779) @@ -275,7 +275,18 @@ <load-on-startup>1</load-on-startup> </servlet> + <!-- CMSC-1565 --> + <servlet> + <description>Returns css text</description> + <servlet-name>stylesheet</servlet-name> + <servlet-class>com.finalist.cmsc.servlet.StylesheetServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>stylesheet</servlet-name> + <url-pattern>/stylesheet/*</url-pattern> + </servlet-mapping> + <servlet-mapping> <servlet-name>version</servlet-name> <url-pattern>/version</url-pattern> _______________________________________________ Cvs mailing list [email protected] http://lists.mmbase.org/mailman/listinfo/cvs
