You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2009/02/17 15:20:46 UTC
svn commit: r745092 -
/camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml
Author: jstrachan
Date: Tue Feb 17 14:20:46 2009
New Revision: 745092
URL: http://svn.apache.org/viewvc?rev=745092&view=rev
Log:
removed cruft and switched the order around of the filters
Modified:
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml
Modified: camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml?rev=745092&r1=745091&r2=745092&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml (original)
+++ camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml Tue Feb 17 14:20:46 2009
@@ -26,16 +26,6 @@
<display-name>Camel Console</display-name>
- <filter>
- <filter-name>sitemesh</filter-name>
- <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>sitemesh</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
@@ -64,53 +54,22 @@
<param-value>/(images|css|js)/.*</param-value>
</init-param>
</filter>
+
<filter-mapping>
<filter-name>Jersey Filter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <filter>
+ <filter-name>sitemesh</filter-name>
+ <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+ </filter>
- <!--
+ <filter-mapping>
+ <filter-name>sitemesh</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <servlet>
- <servlet-name>Jersey Spring</servlet-name>
- <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
- <init-param>
- <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
- <param-value>org.apache.camel.rest.util.CamelResourceConfig</param-value>
- </init-param>
- <init-param>
- <param-name>com.sun.jersey.config.feature.Redirect</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>com.sun.jersey.config.feature.ImplicitViewables</param-name>
- <param-value>true</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Jersey Spring</servlet-name>
- <url-pattern>/camel*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Jersey Spring</servlet-name>
- <url-pattern>/camel/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Jersey Spring</servlet-name>
- <url-pattern>/camel</url-pattern>
- </servlet-mapping>
-
- -->
-
- <!--
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
- -->
<jsp-config>
<jsp-property-group>