geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r325978 - in /geronimo/trunk/sandbox/daytrader/modules/web/src: java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Include.java webapp/WEB-INF/classes/org/ webapp/WEB-INF/web.xml
Date Mon, 17 Oct 2005 20:31:12 GMT
Author: hogstrom
Date: Mon Oct 17 13:31:07 2005
New Revision: 325978

URL: http://svn.apache.org/viewcvs?rev=325978&view=rev
Log:
Updated Web Component to correct deployment / execution issues on Tomcat (Geronimo-1083/1084

Removed:
    geronimo/trunk/sandbox/daytrader/modules/web/src/webapp/WEB-INF/classes/org/
Modified:
    geronimo/trunk/sandbox/daytrader/modules/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Include.java
    geronimo/trunk/sandbox/daytrader/modules/web/src/webapp/WEB-INF/web.xml

Modified: geronimo/trunk/sandbox/daytrader/modules/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Include.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/modules/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Include.java?rev=325978&r1=325977&r2=325978&view=diff
==============================================================================
--- geronimo/trunk/sandbox/daytrader/modules/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Include.java
(original)
+++ geronimo/trunk/sandbox/daytrader/modules/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Include.java
Mon Oct 17 13:31:07 2005
@@ -66,7 +66,8 @@
 				getServletConfig().getServletContext().getRequestDispatcher("/servlet/PingServlet2IncludeRcv").include(req,
res);
 			}
 			
-			ServletOutputStream out = res.getOutputStream();
+//			ServletOutputStream out = res.getOutputStream();
+			java.io.PrintWriter out = res.getWriter();
 			out.println(
 				"<html><head><title>Ping Servlet 2 Include</title></head>"
 					+ "<body><HR><BR><FONT size=\"+2\" color=\"#000066\">Ping Servlet
2 Include<BR></FONT><FONT size=\"+1\" color=\"#000066\">Init time : "
@@ -89,4 +90,4 @@
 		initTime = new java.util.Date().toString();
 		hitCount = 0;
 	}
-}
\ No newline at end of file
+}

Modified: geronimo/trunk/sandbox/daytrader/modules/web/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/daytrader/modules/web/src/webapp/WEB-INF/web.xml?rev=325978&r1=325977&r2=325978&view=diff
==============================================================================
--- geronimo/trunk/sandbox/daytrader/modules/web/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/sandbox/daytrader/modules/web/src/webapp/WEB-INF/web.xml Mon Oct 17 13:31:07
2005
@@ -360,18 +360,6 @@
          <error-code>500</error-code>
          <location>/error.jsp</location>
       </error-page>
-      <message-destination-ref id="MessageDestinationRef_1">
-         <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
-         <message-destination-type>javax.jms.Queue</message-destination-type>
-         <message-destination-usage>Produces</message-destination-usage>
-         <message-destination-link>daytrader-ejb-1.0-SNAPSHOT.jar#TradeBrokerQueue</message-destination-link>
-      </message-destination-ref>
-      <message-destination-ref id="MessageDestinationRef_2">
-         <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
-         <message-destination-type>javax.jms.Topic</message-destination-type>
-         <message-destination-usage>Produces</message-destination-usage>
-         <message-destination-link>daytrader-ejb-1.0-SNAPSHOT.jar#TradeStreamerTopic</message-destination-link>
-      </message-destination-ref>
       <resource-ref>
          <res-ref-name>jdbc/TradeDataSource</res-ref-name>
          <res-type>javax.sql.DataSource</res-type>
@@ -390,6 +378,18 @@
          <res-auth>Application</res-auth>
          <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
+      <message-destination-ref id="MessageDestinationRef_1">
+         <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+         <message-destination-type>javax.jms.Queue</message-destination-type>
+         <message-destination-usage>Produces</message-destination-usage>
+         <message-destination-link>daytrader-ejb-1.0-SNAPSHOT.jar#TradeBrokerQueue</message-destination-link>
+      </message-destination-ref>
+      <message-destination-ref id="MessageDestinationRef_2">
+         <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+         <message-destination-type>javax.jms.Topic</message-destination-type>
+         <message-destination-usage>Produces</message-destination-usage>
+         <message-destination-link>daytrader-ejb-1.0-SNAPSHOT.jar#TradeStreamerTopic</message-destination-link>
+      </message-destination-ref>
       <ejb-ref>
          <ejb-ref-name>ejb/Trade</ejb-ref-name>
          <ejb-ref-type>Session</ejb-ref-type>



Mime
View raw message