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 17:22:59 UTC
svn commit: r577794 -
/geronimo/daytrader/branches/1.2/modules/web/src/main/webapp/WEB-INF/web.xml
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>