Return-Path: 
 <scm-return-22140-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 44858 invoked from network); 20 Sep 2007 15:23:23 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 20 Sep 2007 15:23:23 -0000
Received: (qmail 32296 invoked by uid 500); 20 Sep 2007 15:23:14 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 32263 invoked by uid 500); 20 Sep 2007 15:23:14 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 32252 invoked by uid 99); 20 Sep 2007 15:23:14 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Sep 2007 08:23:14 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Sep 2007 15:25:21 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 759811A9832; Thu, 20 Sep 2007 08:22:59 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r577794 -
 /geronimo/daytrader/branches/1.2/modules/web/src/main/webapp/WEB-INF/web.xml
Date: Thu, 20 Sep 2007 15:22:59 -0000
To: scm@geronimo.apache.org
From: cjblythe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20070920152259.759811A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cjblythe
Date: Thu Sep 20 08:22:58 2007
New Revision: 577794

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

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

Modified: geronimo/daytrader/branches/1.2/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/1.2/modules/web/src/main/webapp/WEB-INF/web.xml?rev=577794&r1=577793&r2=577794&view=diff
==============================================================================
--- geronimo/daytrader/branches/1.2/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/branches/1.2/modules/web/src/main/webapp/WEB-INF/web.xml Thu Sep 20 08:22:58 2007
@@ -155,9 +155,14 @@
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Servlet</servlet-class>
       </servlet>
       <servlet>
-         <display-name>PingServlet2ServletRcv</display-name>
-         <servlet-name>PingServlet2ServletRcv</servlet-name>
-         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2ServletRcv</servlet-class>
+         <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>
@@ -255,16 +260,6 @@
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2TwoPhase</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>org_apache_geronimo_samples_daytrader_TradeWSAction</display-name>
          <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.TradeWSAction</servlet-class>
@@ -309,8 +304,12 @@
          <url-pattern>/servlet/PingServlet2Servlet</url-pattern>
       </servlet-mapping>
       <servlet-mapping>
-         <servlet-name>PingServlet2ServletRcv</servlet-name>
-         <url-pattern>/servlet/PingServlet2ServletRcv</url-pattern>
+         <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>
@@ -388,10 +387,7 @@
          <servlet-name>PingServlet2TwoPhase</servlet-name>
          <url-pattern>/servlet/PingServlet2TwoPhase</url-pattern>
       </servlet-mapping>                 
-      <servlet-mapping>
-         <servlet-name>PingServlet2Include</servlet-name>
-         <url-pattern>/servlet/PingServlet2Include</url-pattern>
-      </servlet-mapping>                 
+                      
       <session-config>
          <session-timeout>30</session-timeout>
       </session-config>