Skip to content

Codecrew / Moya

Go to a project
Commit bf7a0c33 by Tuomas Riihimäki
Options

Resolved conflict with web.xml

2 parents 0d26e972 795ef6a4
Inline Side-by-side
Showing with 24 additions and 25 deletions
code/LanBortalWeb/WebContent/WEB-INF/web.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <display-name>LanBortalWeb</display-name>
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" <context-param>
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
id="WebApp_ID" <param-value>true</param-value>
version="2.5" </context-param>
>
<display-name>LanBortalWeb</display-name> <welcome-file-list>
<welcome-file-list> <welcome-file>index.html</welcome-file>
<welcome-file>index.html</welcome-file> <welcome-file>index.htm</welcome-file>
<welcome-file>index.htm</welcome-file> <welcome-file>index.jsp</welcome-file>
<welcome-file>index.jsp</welcome-file> <welcome-file>default.html</welcome-file>
<welcome-file>default.html</welcome-file> <welcome-file>default.htm</welcome-file>
<welcome-file>default.htm</welcome-file> <welcome-file>default.jsp</welcome-file>
<welcome-file>default.jsp</welcome-file> </welcome-file-list>
</welcome-file-list> <servlet>
<servlet> <servlet-name>Faces Servlet</servlet-name>
<servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class> </servlet>
</servlet> <servlet-mapping>
<servlet-mapping> <servlet-name>Faces Servlet</servlet-name>
<servlet-name>Faces Servlet</servlet-name> <url-pattern>*.jsf</url-pattern>
<url-pattern>*.jsf</url-pattern> </servlet-mapping>
</servlet-mapping>
<filter> <filter>
<display-name>HostnameFilter</display-name> <display-name>HostnameFilter</display-name>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!