Author: jlmonteiro
Date: Thu Nov 8 10:05:44 2012
New Revision: 1406989
URL: http://svn.apache.org/viewvc?rev=1406989&view=rev
Log:
Change the welcome page to index.html and re order the whole file to make it
servlet compliant
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml?rev=1406989&r1=1406988&r2=1406989&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
Thu Nov 8 10:05:44 2012
@@ -21,152 +21,126 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
version="3.0" metadata-complete="true">
- <display-name>Tomee Application</display-name>
+ <display-name>Tomee Application</display-name>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
- <error-page>
- <exception-type>
- org.apache.tomee.webapp.TomeeException
- </exception-type>
- <location>
- /error
- </location>
- </error-page>
-
- <listener>
-
<listener-class>org.apache.tomee.webapp.listeners.SessionListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>LoaderServlet</servlet-name>
- <servlet-class>org.apache.tomee.loader.LoaderServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <!--
**************************************************************************************
-->
-
- <servlet>
- <servlet-name>applicationSocketServlet</servlet-name>
-
<servlet-class>org.apache.tomee.webapp.servlet.ApplicationSocketServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>applicationSocketServlet</servlet-name>
- <url-pattern>/socket</url-pattern>
- </servlet-mapping>
-
- <!--
**************************************************************************************
-->
-
- <servlet>
- <servlet-name>sessionServlet</servlet-name>
-
<servlet-class>org.apache.tomee.webapp.servlet.SessionServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>sessionServlet</servlet-name>
- <url-pattern>/session</url-pattern>
- </servlet-mapping>
-
- <!--
**************************************************************************************
-->
-
- <servlet>
- <servlet-name>commandServlet</servlet-name>
-
<servlet-class>org.apache.tomee.webapp.servlet.CommandExecutorServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>commandServlet</servlet-name>
- <url-pattern>/command</url-pattern>
- </servlet-mapping>
-
- <!--
**************************************************************************************
-->
-
- <servlet>
- <servlet-name>ServerServlet</servlet-name>
-
<servlet-class>org.apache.openejb.server.httpd.ServerServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ServerServlet</servlet-name>
- <url-pattern>/ejb/*</url-pattern>
- </servlet-mapping>
-
- <!--
**************************************************************************************
-->
-
- <servlet>
- <servlet-name>InstallerServlet</servlet-name>
-
<servlet-class>org.apache.tomee.installer.InstallerServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>InstallerServlet</servlet-name>
- <url-pattern>/installer</url-pattern>
- </servlet-mapping>
-
-
- <!--
**************************************************************************************
-->
-
- <servlet>
- <servlet-name>FileUploadServlet</servlet-name>
-
<servlet-class>org.apache.tomee.webapp.servlet.FileUploadServlet</servlet-class>
- <multipart-config>
- <max-file-size>20848820</max-file-size>
- <max-request-size>418018841</max-request-size>
- <file-size-threshold>1048576</file-size-threshold>
- </multipart-config>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>FileUploadServlet</servlet-name>
- <url-pattern>/upload/*</url-pattern>
- </servlet-mapping>
-
- <!--
**************************************************************************************
-->
-
- <servlet>
- <servlet-name>ErrorServlet</servlet-name>
-
<servlet-class>org.apache.tomee.webapp.servlet.ErrorServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ErrorServlet</servlet-name>
- <url-pattern>/error/*</url-pattern>
- </servlet-mapping>
-
- <!--
**************************************************************************************
-->
-
- <!-- basic security to replace context.xml and allow remote accesses -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Application</web-resource-name>
- <url-pattern>/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>tomee-admin</role-name>
- </auth-constraint>
- </security-constraint>
-
- <!-- /ejb/* has no auth-constraint. It is has public access. -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Server EJB</web-resource-name>
- <url-pattern>/ejb/*</url-pattern>
- </web-resource-collection>
- </security-constraint>
-
- <!-- /socket has no auth-constraint. It is has public access. -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Socket</web-resource-name>
- <url-pattern>/socket</url-pattern>
- </web-resource-collection>
- </security-constraint>
-
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>TomEE Webapp</realm-name>
- </login-config>
- <security-role>
- <role-name>tomee-admin</role-name>
- </security-role>
+ <listener>
+
<listener-class>org.apache.tomee.webapp.listeners.SessionListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>LoaderServlet</servlet-name>
+ <servlet-class>org.apache.tomee.loader.LoaderServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>applicationSocketServlet</servlet-name>
+
<servlet-class>org.apache.tomee.webapp.servlet.ApplicationSocketServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>sessionServlet</servlet-name>
+
<servlet-class>org.apache.tomee.webapp.servlet.SessionServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>commandServlet</servlet-name>
+
<servlet-class>org.apache.tomee.webapp.servlet.CommandExecutorServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>ServerServlet</servlet-name>
+
<servlet-class>org.apache.openejb.server.httpd.ServerServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>InstallerServlet</servlet-name>
+ <servlet-class>org.apache.tomee.installer.InstallerServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>FileUploadServlet</servlet-name>
+
<servlet-class>org.apache.tomee.webapp.servlet.FileUploadServlet</servlet-class>
+ <multipart-config>
+ <max-file-size>20848820</max-file-size>
+ <max-request-size>418018841</max-request-size>
+ <file-size-threshold>1048576</file-size-threshold>
+ </multipart-config>
+ </servlet>
+ <servlet>
+ <servlet-name>ErrorServlet</servlet-name>
+ <servlet-class>org.apache.tomee.webapp.servlet.ErrorServlet</servlet-class>
+ </servlet>
+
+ <!--
**************************************************************************************
-->
+ <servlet-mapping>
+ <servlet-name>applicationSocketServlet</servlet-name>
+ <url-pattern>/socket</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>sessionServlet</servlet-name>
+ <url-pattern>/session</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>commandServlet</servlet-name>
+ <url-pattern>/command</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ServerServlet</servlet-name>
+ <url-pattern>/ejb/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>InstallerServlet</servlet-name>
+ <url-pattern>/installer</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>FileUploadServlet</servlet-name>
+ <url-pattern>/upload/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ErrorServlet</servlet-name>
+ <url-pattern>/error/*</url-pattern>
+ </servlet-mapping>
+
+ <!--
**************************************************************************************
-->
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+ <error-page>
+ <exception-type>
+ org.apache.tomee.webapp.TomeeException
+ </exception-type>
+ <location>
+ /error
+ </location>
+ </error-page>
+ <!-- basic security to replace context.xml and allow remote accesses -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Application</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>tomee-admin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <!-- /ejb/* has no auth-constraint. It is has public access. -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Server EJB</web-resource-name>
+ <url-pattern>/ejb/*</url-pattern>
+ </web-resource-collection>
+ </security-constraint>
+
+ <!-- /socket has no auth-constraint. It is has public access. -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Socket</web-resource-name>
+ <url-pattern>/socket</url-pattern>
+ </web-resource-collection>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>TomEE Webapp</realm-name>
+ </login-config>
+ <security-role>
+ <role-name>tomee-admin</role-name>
+ </security-role>
</web-app>
