geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r530510 - /geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
Date Thu, 19 Apr 2007 18:39:23 GMT
Author: hogstrom
Date: Thu Apr 19 11:39:21 2007
New Revision: 530510

URL: http://svn.apache.org/viewvc?view=rev&rev=530510
Log:
Changed from 2.4 spec to 2.5 spec for web.xml.  Also, commented out missing servlets pending
future addition.

Modified:
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml?view=diff&rev=530510&r1=530509&r2=530510
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml Thu Apr 19 11:39:21
2007
@@ -16,13 +16,9 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 -->
-<!-- web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"
 	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_2_5.xsd"
-->
-	<web-app version="2.4"
-		xmlns="http://java.sun.com/xml/ns/j2ee"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
 	<display-name>DayTraderWeb</display-name>
 	<filter>
@@ -514,9 +510,9 @@
 	<!--  servlet>
 		<servlet-name>PingServlet2UnmanagedEntity</servlet-name>
 		<servlet-class>
-			org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2UnmanagedEntity
+		org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2UnmanagedEntity
 		</servlet-class>
-	</servlet -->
+		</servlet -->
 	<servlet>
 		<servlet-name>PingServlet2Session2MDB</servlet-name>
 		<servlet-class>
@@ -781,7 +777,7 @@
 	<!--   servlet-mapping>
 		<servlet-name>PingServlet2UnmanagedEntity</servlet-name>
 		<url-pattern>/PingServlet2UnmanagedEntity</url-pattern>
-	</servlet-mapping -->
+		</servlet-mapping -->
 	<servlet-mapping>
 		<servlet-name>PingServlet2Session2MDB</servlet-name>
 		<url-pattern>/PingServlet2Session2MDB</url-pattern>



Mime
View raw message