remove old comments/name about Filter now it is a Servlet
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/92aca43d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/92aca43d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/92aca43d Branch: refs/heads/master Commit: 92aca43d8b395a78feb0cf8ba99a29e92d122ee2 Parents: e79353c Author: Alex Heneveld <[email protected]> Authored: Wed Mar 30 15:50:38 2016 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Mar 30 19:05:59 2016 +0100 ---------------------------------------------------------------------- rest/rest-server/src/main/webapp/WEB-INF/web.xml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/92aca43d/rest/rest-server/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/rest/rest-server/src/main/webapp/WEB-INF/web.xml b/rest/rest-server/src/main/webapp/WEB-INF/web.xml index b763b8e..f5f281d 100644 --- a/rest/rest-server/src/main/webapp/WEB-INF/web.xml +++ b/rest/rest-server/src/main/webapp/WEB-INF/web.xml @@ -38,16 +38,8 @@ <url-pattern>/*</url-pattern> </filter-mapping> - <!-- Brooklyn REST is usually run as a filter so static content can be placed in a webapp - to which this is added; to run as a servlet directly, replace the filter tags - below (after the comment) with the servlet tags (commented out immediately below), - (and do the same for the matching tags at the bottom) - <servlet> - <servlet-name>Brooklyn REST API v1 Servlet</servlet-name> - <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class> - --> <servlet> - <servlet-name>Brooklyn REST API v1 Filter</servlet-name> + <servlet-name>Brooklyn REST API v1 Servlet</servlet-name> <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class> <init-param> @@ -89,7 +81,7 @@ </servlet> <servlet-mapping> - <servlet-name>Brooklyn REST API v1 Filter</servlet-name> + <servlet-name>Brooklyn REST API v1 Servlet</servlet-name> <url-pattern>/v1/*</url-pattern> </servlet-mapping> </web-app>
