Marijan Milicevic pushed to branch master at cms-community / hippo-project-archetype
Commits: 33604eae by Bert Leunis at 2016-12-20T10:11:49+01:00 ARCHE-521 remove redundant web.xml for essentials webapp - - - - - efe4aae3 by Marijan Milicevic at 2017-01-23T12:44:43+01:00 Merge branch 'master' into feature/ARCHE-521 - - - - - 1 changed file: - − src/main/resources/archetype-resources/essentials/src/main/webapp/WEB-INF/web.xml Changes: ===================================== src/main/resources/archetype-resources/essentials/src/main/webapp/WEB-INF/web.xml deleted ===================================== --- a/src/main/resources/archetype-resources/essentials/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - Copyright 2014 Hippo B.V. (http://www.onehippo.com) - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<web-app xmlns="http://java.sun.com/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; - version="3.0" - id="essentials"> - - <display-name>essentials-webapp</display-name> - <listener> - <listener-class>org.onehippo.cms7.essentials.rest.config.RestServletListener</listener-class> - </listener> - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>classpath:applicationContext.xml</param-value> - </context-param> - <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> - </listener> - <servlet> - <display-name>REST</display-name> - <servlet-name>REST</servlet-name> - <servlet-class>org.onehippo.cms7.essentials.servlet.RestServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>REST</servlet-name> - <url-pattern>/rest/*</url-pattern> - </servlet-mapping> - <error-page> - <error-code>404</error-code> - <location>/WEB-INF/jsp/errors/404.jsp</location> - </error-page> - <error-page> - <error-code>500</error-code> - <location>/WEB-INF/jsp/errors/500.jsp</location> - </error-page> - - <welcome-file-list> - <welcome-file>/WEB-INF/jsp/index.jsp</welcome-file> - </welcome-file-list> -</web-app> View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/compare/096aba0dad6d0ff530cf29080922c52b6cebdc02...efe4aae3a8b171b45bd703d46c292c868157d3e3
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
