You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2012/06/09 13:47:28 UTC
svn commit: r1348364 - in /openejb/trunk/openejb/tomee:
tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml
tomee-webapp/src/main/webapp/WEB-INF/web.xml
Author: tveronezi
Date: Sat Jun 9 11:47:27 2012
New Revision: 1348364
URL: http://svn.apache.org/viewvc?rev=1348364&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-225
organizing the web.xml files
Modified:
openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
Modified: openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml?rev=1348364&r1=1348363&r2=1348364&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml Sat Jun 9 11:47:27 2012
@@ -32,36 +32,70 @@
</location>
</error-page>
+ <!-- ************************************************************************************** -->
+
<listener>
<listener-class>org.apache.tomee.webapp.listener.UserSessionListener</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>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>LogServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.LogServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>LogServlet</servlet-name>
+ <url-pattern>/log/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>LogoutServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.LogoutServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>LogoutServlet</servlet-name>
+ <url-pattern>/logout/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>FileUploadServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.FileUploadServlet</servlet-class>
@@ -72,26 +106,62 @@
</multipart-config>
</servlet>
+ <servlet-mapping>
+ <servlet-name>FileUploadServlet</servlet-name>
+ <url-pattern>/upload/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>SystemInfoServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.SystemInfoServlet</servlet-class>
</servlet>
+
+ <servlet-mapping>
+ <servlet-name>SystemInfoServlet</servlet-name>
+ <url-pattern>/system/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>DeployServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.DeployServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>DeployServlet</servlet-name>
+ <url-pattern>/deploy/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>ErrorServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.ErrorServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>ErrorServlet</servlet-name>
+ <url-pattern>/error/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>ConsoleServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.ConsoleServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>ConsoleServlet</servlet-name>
+ <url-pattern>/console/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>SessionDataServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.SessionDataServlet</servlet-class>
@@ -102,50 +172,7 @@
<url-pattern>/data/*</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>SystemInfoServlet</servlet-name>
- <url-pattern>/system/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>LogServlet</servlet-name>
- <url-pattern>/log/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>LogoutServlet</servlet-name>
- <url-pattern>/logout/*</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>
-
- <servlet-mapping>
- <servlet-name>DeployServlet</servlet-name>
- <url-pattern>/deploy/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ConsoleServlet</servlet-name>
- <url-pattern>/console/*</url-pattern>
- </servlet-mapping>
+ <!-- ************************************************************************************** -->
<!-- basic security to replace context.xml and allow remote accesses -->
<security-constraint>
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=1348364&r1=1348363&r2=1348364&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 Sat Jun 9 11:47:27 2012
@@ -32,36 +32,70 @@
</location>
</error-page>
+ <!-- ************************************************************************************** -->
+
<listener>
<listener-class>org.apache.tomee.webapp.listener.UserSessionListener</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>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>LogServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.LogServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>LogServlet</servlet-name>
+ <url-pattern>/log/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>LogoutServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.LogoutServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>LogoutServlet</servlet-name>
+ <url-pattern>/logout/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>FileUploadServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.FileUploadServlet</servlet-class>
@@ -72,26 +106,62 @@
</multipart-config>
</servlet>
+ <servlet-mapping>
+ <servlet-name>FileUploadServlet</servlet-name>
+ <url-pattern>/upload/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>SystemInfoServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.SystemInfoServlet</servlet-class>
</servlet>
+
+ <servlet-mapping>
+ <servlet-name>SystemInfoServlet</servlet-name>
+ <url-pattern>/system/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>DeployServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.DeployServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>DeployServlet</servlet-name>
+ <url-pattern>/deploy/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>ErrorServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.ErrorServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>ErrorServlet</servlet-name>
+ <url-pattern>/error/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>ConsoleServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.ConsoleServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>ConsoleServlet</servlet-name>
+ <url-pattern>/console/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- ************************************************************************************** -->
+
<servlet>
<servlet-name>SessionDataServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.SessionDataServlet</servlet-class>
@@ -102,50 +172,7 @@
<url-pattern>/data/*</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>SystemInfoServlet</servlet-name>
- <url-pattern>/system/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>LogServlet</servlet-name>
- <url-pattern>/log/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>LogoutServlet</servlet-name>
- <url-pattern>/logout/*</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>
-
- <servlet-mapping>
- <servlet-name>DeployServlet</servlet-name>
- <url-pattern>/deploy/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ConsoleServlet</servlet-name>
- <url-pattern>/console/*</url-pattern>
- </servlet-mapping>
+ <!-- ************************************************************************************** -->
<!-- basic security to replace context.xml and allow remote accesses -->
<security-constraint>