You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by cj...@apache.org on 2007/09/20 19:44:30 UTC

svn commit: r577832 - /geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml

Author: cjblythe
Date: Thu Sep 20 10:44:30 2007
New Revision: 577832

URL: http://svn.apache.org/viewvc?rev=577832&view=rev
Log:
DAYTRADER-54 Updated web.xml to fix PingServlet2Include primitive

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?rev=577832&r1=577831&r2=577832&view=diff
==============================================================================
--- 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 Sep 20 10:44:30 2007
@@ -168,6 +168,16 @@
         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2ServletRcv</servlet-class>
     </servlet>
     <servlet>
+        <display-name>PingServlet2Include</display-name>
+        <servlet-name>PingServlet2Include</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Include</servlet-class>
+    </servlet>
+    <servlet>
+        <display-name>PingServlet2IncludeRcv</display-name>
+        <servlet-name>PingServlet2IncludeRcv</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2IncludeRcv</servlet-class>
+    </servlet>
+    <servlet>
         <display-name>PingServlet2Jsp</display-name>
         <servlet-name>PingServlet2Jsp</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Jsp</servlet-class>
@@ -202,16 +212,6 @@
         <servlet-name>PingServlet2JNDI</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2JNDI</servlet-class>
     </servlet>
-    <servlet>
-        <display-name>PingServlet2Include</display-name>
-        <servlet-name>PingServlet2Include</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Include</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2IncludeRcv</display-name>
-        <servlet-name>PingServlet2IncludeRcv</servlet-name>
-		<servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2IncludeRcv</servlet-class>
-	</servlet>
     <!-- End of Web container primitives -->
     
     <!-- EJB container primitives (EJB3) -->   
@@ -306,6 +306,14 @@
         <url-pattern>/servlet/PingServlet2ServletRcv</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
+        <servlet-name>PingServlet2Include</servlet-name>
+        <url-pattern>/servlet/PingServlet2Include</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingServlet2IncludeRcv</servlet-name>
+        <url-pattern>/servlet/PingServlet2IncludeRcv</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
         <servlet-name>PingServlet2Jsp</servlet-name>
         <url-pattern>/servlet/PingServlet2Jsp</url-pattern>
     </servlet-mapping>
@@ -332,10 +340,6 @@
     <servlet-mapping>
 		<servlet-name>PingServlet2JNDI</servlet-name>
 		<url-pattern>/servlet/PingServlet2JNDI</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>PingServlet2Include</servlet-name>
-		<url-pattern>/servlet/PingServlet2Include</url-pattern>
 	</servlet-mapping>
     <!-- End of Web container primitives (Servlet Mappings) -->