Author: agilliland
Date: Wed May 2 10:27:45 2007
New Revision: 534558
URL: http://svn.apache.org/viewvc?view=rev&rev=534558
Log:
start using a static web.xml config file rather than relying on xdoclet to
generate one for us.
also, don't build database scripts with every single build, instead we can just
build them when needed using the gen-dbscripts target.
Added:
roller/trunk/web/WEB-INF/web.xml
Modified:
roller/trunk/build.xml
Modified: roller/trunk/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/build.xml?view=diff&rev=534558&r1=534557&r2=534558
==============================================================================
--- roller/trunk/build.xml (original)
+++ roller/trunk/build.xml Wed May 2 10:27:45 2007
@@ -257,12 +257,6 @@
&custom-gen-web;
- <!-- web.xml config -->
- <deploymentdescriptor servletspec="2.4"
- destdir="${build.webapp}/WEB-INF"
- sessiontimeout="30"
- displayname="Roller Weblogger" />
-
<!-- jsp taglib descriptor config -->
<jsptaglib jspversion="1.2" filename="roller.tld" shortname="roller"
uri="http://www.rollerweblogger.org/tags";
@@ -397,7 +391,7 @@
<!-- Stage web application -->
<!-- ********************************************************************* -->
-<target name="stage-webapp" depends="gen-business, build-business, build-web,
gen-dbscripts, copy-webapp, gen-web" description="Stage webapp, including jars">
+<target name="stage-webapp" depends="gen-business, build-business, build-web,
copy-webapp, gen-web" description="Stage webapp, including jars">
</target>
<target name="copy-webapp" depends="build-web" description="Stage webapp
without code generation">
@@ -454,11 +448,6 @@
<exclude name="installguide/**" />
<exclude name="**/old/**" />
</fileset>
- </copy>
-
- <!-- copy database script files -->
- <copy todir="${build.webapp}/WEB-INF/dbscripts">
- <fileset dir="${build.dbscripts}" />
</copy>
<!-- apply custom web task -->
Added: roller/trunk/web/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/web.xml?view=auto&rev=534558
==============================================================================
--- roller/trunk/web/WEB-INF/web.xml (added)
+++ roller/trunk/web/WEB-INF/web.xml Wed May 2 10:27:45 2007
@@ -0,0 +1,534 @@
+<?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>Roller Weblogger</display-name>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>/WEB-INF/security.xml</param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>struts2</filter-name>
+
<filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>securityFilter</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>
+ <filter-name>RequestFilter</filter-name>
+
<filter-class>org.apache.roller.ui.core.filters.RequestFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>DebugFilter</filter-name>
+
<filter-class>org.apache.roller.ui.core.filters.DebugFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>PersistenceSessionFilter</filter-name>
+
<filter-class>org.apache.roller.ui.core.filters.PersistenceSessionFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>CompressionFilter</filter-name>
+
<filter-class>org.apache.roller.ui.core.filters.CompressionFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>RequestMappingFilter</filter-name>
+
<filter-class>org.apache.roller.ui.rendering.filters.RequestMappingFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>InitFilter</filter-name>
+
<filter-class>org.apache.roller.ui.core.filters.InitFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>IPBanFilter</filter-name>
+
<filter-class>org.apache.roller.ui.core.filters.IPBanFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>SchemeEnforcementFilter</filter-name>
+
<filter-class>org.apache.roller.ui.core.filters.SchemeEnforcementFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>CharEncodingFilter</filter-name>
+
<filter-class>org.apache.roller.ui.core.filters.CharEncodingFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>StrutsCharEncodingFilter</filter-name>
+
<filter-class>org.apache.roller.ui.core.filters.StrutsCharEncodingFilter</filter-class>
+ </filter>
+
+
+ <!-- ******************************************
+ Filter mappings - order IS important here.
+ ****************************************** -->
+
+ <!--
+ NOTE: Wherever "dispatcher" elements are specified in the filter
mappings, they are
+ required for Servlet API 2.4 containers, such as Tomcat 5+ and Resin 3+,
but should be
+ commented out for Servlet API 2.3 containers, like Tomcat 4.x and Resin
2.x.
+ -->
+
+ <!-- This filter ensures that the request encoding is set to UTF-8 before
any
+ other processing forces request parsing using a default encoding.
+ Note: Any filters preceding this one MUST not cause request parsing. -->
+ <filter-mapping>
+ <filter-name>CharEncodingFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+
+ <!-- Ensures character encoding set to UTF-8 and JSTL and Struts locales
are in sync. -->
+ <filter-mapping>
+ <filter-name>StrutsCharEncodingFilter</filter-name>
+ <url-pattern>/roller-ui/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+
+ <!-- Ip Banning is mapped for comment and trackbacks only.
+ Note: this filter does nothing if an ip ban list is not configured. -->
+ <filter-mapping>
+ <filter-name>IPBanFilter</filter-name>
+ <url-pattern>/roller-ui/rendering/comment/*</url-pattern>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>IPBanFilter</filter-name>
+ <url-pattern>/roller-ui/rendering/trackback/*</url-pattern>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+
+ <!-- Scheme enforcement. Only here until we get Acegi scheme enforcement
working -->
+ <filter-mapping>
+ <filter-name>SchemeEnforcementFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <!-- Acegi Security filters - controls secure access to different parts of
Roller -->
+ <filter-mapping>
+ <filter-name>securityFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+
+ <!-- Map everything to the PersistenceSessionFilter.
+ NOTE: Any filters preceding this one MUST NOT use persistence sessions.-->
+ <filter-mapping>
+ <filter-name>PersistenceSessionFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <!-- Init filter. performs some initialization on first request -->
+ <filter-mapping>
+ <filter-name>InitFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <!-- Request mapping. this is what allows the urls to work -->
+ <filter-mapping>
+ <filter-name>RequestMappingFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <!-- Compression Filter -->
+ <filter-mapping>
+ <filter-name>CompressionFilter</filter-name>
+ <url-pattern>/roller-ui/rendering/page/*</url-pattern>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>CompressionFilter</filter-name>
+ <url-pattern>/roller-ui/rendering/feed/*</url-pattern>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+
+ <!-- Struts2 -->
+ <filter-mapping>
+ <filter-name>struts2</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+
+ <!-- Do we still need the RequestFilter? -->
+ <filter-mapping>
+ <filter-name>RequestFilter</filter-name>
+ <url-pattern>*.do</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+
+
+ <!-- Context Listeners -->
+ <listener>
+
<listener-class>org.apache.roller.ui.core.RollerSession</listener-class>
+ </listener>
+
+ <listener>
+
<listener-class>org.apache.roller.ui.core.RollerContext</listener-class>
+ </listener>
+
+ <listener>
+
<listener-class>org.apache.tiles.listener.TilesListener</listener-class>
+ </listener>
+
+
+ <!-- Servlet Definitions -->
+ <servlet>
+ <servlet-name>PageServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.PageServlet</servlet-class>
+ <load-on-startup>5</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>FeedServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.FeedServlet</servlet-class>
+ <load-on-startup>5</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>ResourceServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.ResourceServlet</servlet-class>
+ <load-on-startup>5</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SearchServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.SearchServlet</servlet-class>
+ <load-on-startup>5</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>CommentServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.CommentServlet</servlet-class>
+ <load-on-startup>7</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>TrackbackServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.TrackbackServlet</servlet-class>
+ <load-on-startup>7</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>RSDServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.RSDServlet</servlet-class>
+ <load-on-startup>7</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>PlanetFeedServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.PlanetFeedServlet</servlet-class>
+ <load-on-startup>7</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>CommentAuthenticatorServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.CommentAuthenticatorServlet</servlet-class>
+ <load-on-startup>7</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>PreviewServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.PreviewServlet</servlet-class>
+ <load-on-startup>9</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>PreviewResourceServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.servlets.PreviewResourceServlet</servlet-class>
+ <load-on-startup>9</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>RedirectServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.rendering.velocity.deprecated.RedirectServlet</servlet-class>
+ <load-on-startup>9</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>AtomServlet</servlet-name>
+
<servlet-class>org.apache.roller.webservices.atomprotocol.AtomServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>CommentDataServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.authoring.ajax.CommentDataServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>UserDataServlet</servlet-name>
+
<servlet-class>org.apache.roller.ui.authoring.ajax.UserDataServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>AdminServlet</servlet-name>
+
<servlet-class>org.apache.roller.webservices.adminprotocol.AdminServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>TagStatsServlet</servlet-name>
+
<servlet-class>org.apache.roller.webservices.json.TagStatsServlet</servlet-class>
+ </servlet>
+
+
+ <!-- The Struts Servlet -->
+ <servlet>
+ <servlet-name>action</servlet-name>
+ <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+ <init-param>
+ <param-name>config</param-name>
+ <param-value>/WEB-INF/struts-config.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>validate</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>XmlRpcServlet</servlet-name>
+
<servlet-class>org.apache.xmlrpc.webserver.XmlRpcServlet</servlet-class>
+ <init-param>
+ <description>
+ Sets, whether the servlet supports vendor extensions for
XML-RPC.
+ </description>
+ <param-name>enabledForExtensions</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ </servlet>
+
+
+ <!-- Struts1 support -->
+ <servlet-mapping>
+ <servlet-name>action</servlet-name>
+ <url-pattern>*.do</url-pattern>
+ </servlet-mapping>
+
+
+ <!-- Rendering Servlets -->
+ <servlet-mapping>
+ <servlet-name>PageServlet</servlet-name>
+ <url-pattern>/roller-ui/rendering/page/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FeedServlet</servlet-name>
+ <url-pattern>/roller-ui/rendering/feed/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ResourceServlet</servlet-name>
+ <url-pattern>/roller-ui/rendering/resources/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>CommentServlet</servlet-name>
+ <url-pattern>/roller-ui/rendering/comment/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TrackbackServlet</servlet-name>
+ <url-pattern>/roller-ui/rendering/trackback/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>RSDServlet</servlet-name>
+ <url-pattern>/roller-ui/rendering/rsd/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SearchServlet</servlet-name>
+ <url-pattern>/roller-ui/rendering/search/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>PlanetFeedServlet</servlet-name>
+ <url-pattern>/planetrss/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>CommentAuthenticatorServlet</servlet-name>
+ <url-pattern>/CommentAuthenticatorServlet</url-pattern>
+ </servlet-mapping>
+
+
+ <!-- Preview Servlets -->
+ <servlet-mapping>
+ <servlet-name>PreviewServlet</servlet-name>
+ <url-pattern>/roller-ui/authoring/preview/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>PreviewResourceServlet</servlet-name>
+ <url-pattern>/roller-ui/authoring/previewresource/*</url-pattern>
+ </servlet-mapping>
+
+
+ <!-- Servlets for supporting Ajax -->
+ <servlet-mapping>
+ <servlet-name>CommentDataServlet</servlet-name>
+ <url-pattern>/roller-ui/authoring/commentdata/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>UserDataServlet</servlet-name>
+ <url-pattern>/roller-ui/authoring/userdata/*</url-pattern>
+ </servlet-mapping>
+
+
+ <!-- Web Service Servlets -->
+ <servlet-mapping>
+ <servlet-name>XmlRpcServlet</servlet-name>
+ <url-pattern>/roller-services/xmlrpc</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>AtomServlet</servlet-name>
+ <url-pattern>/roller-services/app/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>AdminServlet</servlet-name>
+ <url-pattern>/roller-services/rap/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TagStatsServlet</servlet-name>
+ <url-pattern>/roller-services/json/tags/*</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>
+
+
+ <session-config>
+ <session-timeout>30</session-timeout>
+ </session-config>
+
+ <welcome-file-list>
+ <welcome-file>home.jsp</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+ <error-page>
+ <exception-type>java.lang.Exception</exception-type>
+ <location>/WEB-INF/jsps/error.jsp</location>
+ </error-page>
+
+ <error-page>
+ <error-code>403</error-code>
+ <location>/WEB-INF/jsps/403.jsp</location>
+ </error-page>
+
+ <error-page>
+ <error-code>404</error-code>
+ <location>/WEB-INF/jsps/404.jsp</location>
+ </error-page>
+
+ <error-page>
+ <error-code>400</error-code>
+ <location>/login-redirect.jsp</location>
+ </error-page>
+
+
+ <!-- jndi resources -->
+ <resource-ref>
+ <res-ref-name>jdbc/rollerdb</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
+ <resource-ref>
+ <res-ref-name>mail/Session</res-ref-name>
+ <res-type>javax.mail.Session</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
+</web-app>
