geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r396334 - in /geronimo/daytrader/trunk/modules/web/src/main: java/org/apache/geronimo/samples/daytrader/web/prims/ webapp/
Date Sun, 23 Apr 2006 22:38:14 GMT
Author: hogstrom
Date: Sun Apr 23 15:38:12 2006
New Revision: 396334

URL: http://svn.apache.org/viewcvs?rev=396334&view=rev
Log:
Changes to multiple jsps and html fils to imporve formant and consistency.


Modified:
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java
    geronimo/daytrader/trunk/modules/web/src/main/webapp/contentHome.html
    geronimo/daytrader/trunk/modules/web/src/main/webapp/portfolioImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/quoteImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/register.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/registerImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/tradehomeImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html
    geronimo/daytrader/trunk/modules/web/src/main/webapp/welcomeImg.jsp

Modified: geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java?rev=396334&r1=396333&r2=396334&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java Sun Apr 23 15:38:12 2006
@@ -82,16 +82,27 @@
 					+ "<BR><BR></FONT>  <B>Hit Count: "
 					+ hitCount 
 					+ "<br>"
-					+ "     Total Memory = " + totalMemory + "<br>"
-					+ "<br> Statistics before GC <br>"
-					+ "       Max Memory = " + maxMemoryBeforeGC + "<br>"
-					+ "      Free Memory = " + freeMemoryBeforeGC + "<br>"
-					+ "      Used Memory = " + (totalMemory - freeMemoryBeforeGC) + "<br>"
-					+ "<br> Statistics after GC <br>"
-					+ "       Max Memory = " + maxMemoryAfterGC + "<br>"
-					+ "      Free Memory = " + freeMemoryAfterGC + "<br>"
-					+ "      Used Memory = " + (totalMemory - freeMemoryAfterGC) + "<br>"
-					+ " Total Time in GC = " + Float.toString((endTime - startTime) / 1000) + "s"
+                     + "<table border=\"0\"><tr>"
+					+ "<td align=\"right\">Total Memory</td><td align=\"right\">" + totalMemory + "</td>"
+                     + "</tr></table>"
+                     + "<table width=\"350\"><tr><td colspan=\"2\" align=\"left\">"
+					+ "Statistics before GC</td></tr>"
+                     + "<tr><td align=\"right\">"
+					+ "Max Memory</td><td align=\"right\">" + maxMemoryBeforeGC + "</td></tr>"
+                    + "<tr><td align=\"right\">"
+					+ "Free Memory</td><td align=\"right\">" + freeMemoryBeforeGC + "</td></tr>"
+                    + "<tr><td align=\"right\">"
+					+ "Used Memory</td><td align=\"right\">" + (totalMemory - freeMemoryBeforeGC) + "</td></tr>"
+					+ "<tr><td colspan=\"2\" align=\"left\">Statistics after GC</td></tr>"
+                    + "<tr><td align=\"right\">"
+					+ "Max Memory</td><td align=\"right\">" + maxMemoryAfterGC + "</td></tr>"
+                    + "<tr><td align=\"right\">"
+					+ "Free Memory</td><td align=\"right\">" + freeMemoryAfterGC + "</td></tr>"
+                    + "<tr><td align=\"right\">"
+					+ "Used Memory</td><td align=\"right\">" + (totalMemory - freeMemoryAfterGC) + "</td></tr>"
+                    + "<tr><td align=\"right\">"
+					+ "Total Time in GC</td><td align=\"right\">" + Float.toString((endTime - startTime) / 1000) + "s</td></tr>"
+                     + "</table>"
 					+ "</body></html>");
 		}
 		catch (Exception e)

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/contentHome.html
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/contentHome.html?rev=396334&r1=396333&r2=396334&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/contentHome.html (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/contentHome.html Sun Apr 23 15:38:12 2006
@@ -8,44 +8,57 @@
 </HEAD>
 
 <BODY bgcolor="#FFFFFF">
-<HR>
-<P align="left"><FONT size="+1"><B>Overview</B></FONT></P>
-<BLOCKQUOTE><FONT face="Times New Roman" size="-1">The Geronimo<SUP>TM</SUP>
-performance benchmark sample provides a suite of Apache developed
-workloads for characterizing performance of the Geronimo J2EE
-Application Server. The workloads consist of an end to end web
-application and a full set of primitives. The applications are a
-collection of Java classes, Java Servlets, Java Server Pages, Web
-Services, and Enterprise Java Beans built to open J2EE APIs. Together
-these provide versatile and portable test cases designed to measure
-aspects of scalability and performance.</FONT></BLOCKQUOTE>
-<P align="center"><IMG src="images/tradeOverview.png" width="651"
-	height="301" border="0" alt=""> <BR>
-<B>DayTrader J2EE Components </B><BR>
-<B>Model-View-Controller Architecture</B></P>
-<BLOCKQUOTE><FONT size="-1"><B>DayTrader</B><BR>
-DayTrader is the Geronimo end-to-end benchmark and performance sample
-application. The new DayTrader benchmark has been re-designed and
-developed to cover Geronimo's significantly expanding programming model.
-This provides a real world workload driving Geronimo's implementation of
-J2EE 1.4 and Web Services including key Geronimo performance components
-and features.<BR>
-<BR>
-DayTrader's new design spans J2EE 1.4 including the new EJB 2.1
-component architecture, Message Driven beans, transactions (1-phase,
-2-phase commit) and Web Services (SOAP, WSDL).<BR>
-<BR>
-<B>Primitives</B><BR>
-</FONT><FONT face="Times New Roman" size="-1">The <A
-	href="web_prmtv.html">Primitives</A> provide a set of workloads to
-individually test various components of the Geronimo Application Server.
-The primitives leverage the DayTrader application infrastructure to test
-specific Geronimo J2EE components such as the servlet engine, JSP
-support, EJB Entitiy, Session and Message Driven beans, HTTP Session
-support and more.</FONT></BLOCKQUOTE>
-<BLOCKQUOTE><FONT face="Times New Roman" size="-1">Additional overview
-information is included in the <A href="docs/tradeFAQ.html">FAQ</A></FONT></BLOCKQUOTE>
-<HR>
+<TABLE width="740">
+	<TR>
+		<TD>
+		<HR>
+		</TD>
+	</TR>
+	<TR>
+		<TD>
+		<P align="left"><FONT size="+1"><B>Overview</B></FONT></P>
+		<BLOCKQUOTE><FONT face="Times New Roman" size="-1">The Geronimo<SUP>TM</SUP>
+		performance benchmark sample provides a suite of Apache developed
+		workloads for characterizing performance of the Geronimo J2EE
+		Application Server. The workloads consist of an end to end web
+		application and a full set of primitives. The applications are a
+		collection of Java classes, Java Servlets, Java Server Pages, Web
+		Services, and Enterprise Java Beans built to open J2EE APIs. Together
+		these provide versatile and portable test cases designed to measure
+		aspects of scalability and performance.</FONT></BLOCKQUOTE>
+		<P align="center"><IMG src="images/tradeOverview.png" width="717" height="538" border="0" alt=""> <BR>
+		<B>DayTrader J2EE Components </B><BR>
+		<B>Model-View-Controller Architecture</B></P>
+		<BLOCKQUOTE><FONT size="-1"><B>DayTrader</B><BR>
+		DayTrader is the Geronimo end-to-end benchmark and performance sample
+		application. The new DayTrader benchmark has been re-designed and
+		developed to cover Geronimo's significantly expanding programming
+		model. This provides a real world workload driving Geronimo's
+		implementation of J2EE 1.4 and Web Services including key Geronimo
+		performance components and features.<BR>
+		<BR>
+		DayTrader's new design spans J2EE 1.4 including the new EJB 2.1
+		component architecture, Message Driven beans, transactions (1-phase,
+		2-phase commit) and Web Services (SOAP, WSDL).<BR>
+		<BR>
+		<B>Primitives</B><BR>
+		</FONT><FONT face="Times New Roman" size="-1">The <A
+			href="web_prmtv.html">Primitives</A> provide a set of workloads to
+		individually test various components of the Geronimo Application
+		Server. The primitives leverage the DayTrader application
+		infrastructure to test specific Geronimo J2EE components such as the
+		servlet engine, JSP support, EJB Entitiy, Session and Message Driven
+		beans, HTTP Session support and more.</FONT></BLOCKQUOTE>
+		<BLOCKQUOTE><FONT face="Times New Roman" size="-1">Additional overview
+		information is included in the <A href="docs/tradeFAQ.html">FAQ</A></FONT></BLOCKQUOTE>
+		</TD>
+	</TR>
+	<TR>
+		<TD>
+		<HR>
+		</TD>
+	</TR>
+</TABLE>
 
 </BODY>
 </HTML>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/portfolioImg.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/portfolioImg.jsp?rev=396334&r1=396333&r2=396334&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/portfolioImg.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/portfolioImg.jsp Sun Apr 23 15:38:12 2006
@@ -6,112 +6,124 @@
 <LINK rel="stylesheet" href="style.css" type="text/css" />
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page
+	import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
-<jsp:useBean id="holdingDataBeans" type="java.util.Collection" scope="request" />
-<jsp:useBean id="quoteDataBeans" type="java.util.Collection" scope="request"/>
+<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
+	scope="request" />
+<jsp:useBean id="quoteDataBeans" type="java.util.Collection"
+	scope="request" />
 <TABLE height="54">
-  <TBODY>
-    <TR>
-			<TD align="center" bgcolor="#000000" width="640" height="10" colspan=5><FONT
-				color="#ffffff"><B>DayTrader Portfolio</B></FONT></TD>
-			<TD align="center" bgcolor="#ffffff" width="100" height="10">
-			    <IMG src="images/spacer.gif" width="45" height="19" border="0"></TD>
-		</TR>
-        <TR align="left">
-            <TD><A href="app?action=home"><IMG src="images/home.gif" width="80" height="20" border="0"></A></TD>
-            <TD><A href="app?action=account"><IMG src="images/account.gif" width="80" height="20" border="0"></A></TD>
-            <TD><B><A href="app?action=portfolio"><IMG src="images/portfolio.gif" width="80" height="20" border="0"></A> </B></TD>
-            <TD><A href="app?action=quotes&symbols=s:0,s:1,s:2,s:3,s:4"><IMG src="images/quotes.gif" width="80" height="20" border="0"></A></TD>
-            <TD><A href="app?action=logout"><IMG src="images/logout.gif" width="80" height="20" border="0"></A></TD>
-            <TD><IMG src="images/graph.gif" width="32" height="32" border="0"></TD>
-        </TR>
-        <TR>
-			<TD align="left" colspan="6"><IMG src="images/line.gif" width="600" height="6" border="0"><BR>
+	<TBODY>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
+				color="#ffffff">DayTrader Portfolio</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+		<TR align="left">
+			<TD><A href="app?action=home"><IMG src="images/menuHome.gif" width="80"
+				height="20" border="0" alt=""></A></TD>
+			<TD><A href="app?action=account"><IMG src="images/account.gif"
+				width="80" height="20" border="0" alt=""></A></TD>
+			<TD><B><A href="app?action=portfolio"><IMG src="images/portfolio.gif"
+				width="80" height="20" border="0" alt=""></A> </B></TD>
+			<TD><A href="app?action=quotes&amp;symbols=s:0,s:1,s:2,s:3,s:4"><IMG
+				src="images/quotes.gif" width="80" height="20" border="0" alt=""></A></TD>
+			<TD><A href="app?action=logout"><IMG src="images/logout.gif"
+				width="80" height="20" border="0" alt=""></A></TD>
+			<TD><IMG src="images/graph.gif" width="32" height="32" border="0"
+				alt=""></TD>
+		</TR>
+		<TR>
+			<TD align="left" colspan="6"><IMG src="images/line.gif" width="600"
+				height="6" border="0" alt=""><BR>
 			<FONT color="#ff0000" size="-2"><%= new java.util.Date() %></FONT></TD>
 		</TR>
-<%
+		<%
 Collection closedOrders = (Collection)request.getAttribute("closedOrders");
 if ( (closedOrders != null) && (closedOrders.size()>0) )
 {
-%>         
-        <TR>
-            <TD colspan="6" bgcolor="#ff0000"><BLINK><B><FONT color="#ffffff">Alert: The following Order(s) have completed.</FONT></B></BLINK></TD>
-        </TR>
-        <TR align="center">
-            <TD colspan="6">
-            <TABLE border="1" style="font-size: smaller">
-                            <TBODY>
-<%
+%>
+		<TR>
+			<TD colspan="6" bgcolor="#ff0000"><BLINK><B><FONT color="#ffffff">Alert:
+			The following Order(s) have completed.</FONT></B></BLINK></TD>
+		</TR>
+		<TR align="center">
+			<TD colspan="6">
+			<TABLE border="1" style="font-size: smaller">
+				<TBODY>
+					<%
 	Iterator it = closedOrders.iterator();
 	while (it.hasNext() )
 	{
 		OrderDataBean closedOrderData = (OrderDataBean)it.next();
-%>                            
-                                <TR align="center">
-                                    <TD><A href="docs/glossary.html">order ID</A></TD>
-                                    <TD><A href="docs/glossary.html">order status</A></TD>
-                                    <TD><A href="docs/glossary.html">creation date</A></TD>
-									<TD><A href="docs/glossary.html">completion date</A></TD>
-									<TD><A href="docs/glossary.html">txn fee</A></TD>
-									<TD><A href="docs/glossary.html">type</A></TD>
-									<TD><A href="docs/glossary.html">symbol</A></TD>
-									<TD><A href="docs/glossary.html">quantity</A></TD>
-                                </TR>
-                                <TR align="center">
-                        <TD><%= closedOrderData.getOrderID()%></TD>
-                        <TD><%= closedOrderData.getOrderStatus()%></TD>
-                                    <TD><%= closedOrderData.getOpenDate()%></TD>
-                                    <TD><%= closedOrderData.getCompletionDate()%></TD>
-                                    <TD><%= closedOrderData.getOrderFee()%></TD>
-                                    <TD><%= closedOrderData.getOrderType()%></TD>
-                                    <TD><%= FinancialUtils.printQuoteLink(closedOrderData.getSymbol())%></TD>
-                                    <TD><%= closedOrderData.getQuantity()%></TD>
-                                </TR>
-        <%
+%>
+					<TR align="center">
+						<TD><A href="docs/glossary.html">order ID</A></TD>
+						<TD><A href="docs/glossary.html">order status</A></TD>
+						<TD><A href="docs/glossary.html">creation date</A></TD>
+						<TD><A href="docs/glossary.html">completion date</A></TD>
+						<TD><A href="docs/glossary.html">txn fee</A></TD>
+						<TD><A href="docs/glossary.html">type</A></TD>
+						<TD><A href="docs/glossary.html">symbol</A></TD>
+						<TD><A href="docs/glossary.html">quantity</A></TD>
+					</TR>
+					<TR align="center">
+						<TD><%= closedOrderData.getOrderID()%></TD>
+						<TD><%= closedOrderData.getOrderStatus()%></TD>
+						<TD><%= closedOrderData.getOpenDate()%></TD>
+						<TD><%= closedOrderData.getCompletionDate()%></TD>
+						<TD><%= closedOrderData.getOrderFee()%></TD>
+						<TD><%= closedOrderData.getOrderType()%></TD>
+						<TD><%= FinancialUtils.printQuoteLink(closedOrderData.getSymbol())%></TD>
+						<TD><%= closedOrderData.getQuantity()%></TD>
+					</TR>
+					<%
 	}
 %>
-                                
-                            </TBODY>
-                        </TABLE>
-            </TD>
-        </TR>
-        <%
+
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+		<%
 }
 %>
-    </TBODY>
+	</TBODY>
 </TABLE>
 <TABLE width="645">
-    <TBODY>
-        <TR>
-            <TD valign="top" width="643">
-            <TABLE width="100%">
-                <TBODY>
+	<TBODY>
+		<TR>
+			<TD valign="top" width="643">
+			<TABLE width="100%">
+				<TBODY>
 
-                    <TR>
-                        <TD colspan="5" bgcolor="#cccccc"><B>Portfolio </B></TD>
-                        <TD bgcolor="#cccccc" align="right"><B>Number of Holdings: </B><%= holdingDataBeans.size()
+					<TR>
+						<TD colspan="5" bgcolor="#cccccc"><B>Portfolio </B></TD>
+						<TD bgcolor="#cccccc" align="right"><B>Number of Holdings: </B><%= holdingDataBeans.size()
 %></TD>
-                    </TR>
-                    <TR align="center">
-                        <TD colspan="6">
-                        <CENTER></CENTER>
-                        <TABLE border="1" style="font-size: smaller">
-                            <CAPTION align="bottom"><B>Portfolio </B></CAPTION>
-                            <TBODY>
-                                <TR align="center">
-                                    <TD><A href="docs/glossary.html">holding ID</A></TD>
-                                    <TD><A href="docs/glossary.html">purchase date</A></TD>
-                                    <TD><A href="docs/glossary.html">symbol</A></TD>
-                                    <TD><A href="docs/glossary.html">quantity</A></TD>
-                                    <TD><A href="docs/glossary.html">purchase price</A></TD>
-                                    <TD><A href="docs/glossary.html">current price</A></TD>
-                                    <TD><A href="docs/glossary.html">purchase basis</A></TD>                                    
-                                    <TD><A href="docs/glossary.html">market value</A></TD>
-                                    <TD><A href="docs/glossary.html">gain/(loss)</A></TD>
-                                    <TD><B><A href="docs/glossary.html">trade</A></B></TD>
-                                </TR>
-                                <% // Create Hashmap for quick lookup of quote values
+					</TR>
+					<TR align="center">
+						<TD colspan="6">
+						<CENTER></CENTER>
+						<TABLE border="1" style="font-size: smaller">
+							<CAPTION align="bottom"><B>Portfolio </B></CAPTION>
+							<TBODY>
+								<TR align="center">
+									<TD><A href="docs/glossary.html">holding ID</A></TD>
+									<TD><A href="docs/glossary.html">purchase date</A></TD>
+									<TD><A href="docs/glossary.html">symbol</A></TD>
+									<TD><A href="docs/glossary.html">quantity</A></TD>
+									<TD><A href="docs/glossary.html">purchase price</A></TD>
+									<TD><A href="docs/glossary.html">current price</A></TD>
+									<TD><A href="docs/glossary.html">purchase basis</A></TD>
+									<TD><A href="docs/glossary.html">market value</A></TD>
+									<TD><A href="docs/glossary.html">gain/(loss)</A></TD>
+									<TD><B><A href="docs/glossary.html">trade</A></B></TD>
+								</TR>
+								<% // Create Hashmap for quick lookup of quote values
 Iterator it = quoteDataBeans.iterator();
 HashMap quoteMap = new HashMap();                                
 while ( it.hasNext() ) 
@@ -145,19 +157,19 @@
 			gainPercent = marketValue.divide(basis, BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(1.0)).multiply(new BigDecimal(100.0));                        	
 	
                          %>
-                                <TR bgcolor="#fafcb6" align="center">
-                                    <TD><%= holdingData.getHoldingID() %></TD>
-                                    <TD><%= holdingData.getPurchaseDate() %></TD>
-                                    <TD><%= FinancialUtils.printQuoteLink(holdingData.getQuoteID()) %></TD>
-                                    <TD><%= holdingData.getQuantity() %></TD>
-                                    <TD><%= holdingData.getPurchasePrice() %></TD>
-                                    <TD><%= quoteData.getPrice() %></TD>
-                                    <TD><%= basis %></TD>
-                                    <TD><%= marketValue %></TD>
-                                    <TD><%= FinancialUtils.printGainHTML(gain) %></TD>
-                                    <TD><B><%= "<A href=\"app?action=sell&holdingID=" + holdingData.getHoldingID()+"\">sell</A>"%></B></TD>
-                                </TR>
-                                <% 
+								<TR bgcolor="#fafcb6" align="center">
+									<TD><%= holdingData.getHoldingID() %></TD>
+									<TD><%= holdingData.getPurchaseDate() %></TD>
+									<TD><%= FinancialUtils.printQuoteLink(holdingData.getQuoteID()) %></TD>
+									<TD><%= holdingData.getQuantity() %></TD>
+									<TD><%= holdingData.getPurchasePrice() %></TD>
+									<TD><%= quoteData.getPrice() %></TD>
+									<TD><%= basis %></TD>
+									<TD><%= marketValue %></TD>
+									<TD><%= FinancialUtils.printGainHTML(gain) %></TD>
+									<TD><B><%= "<A href=\"app?action=sell&holdingID=" + holdingData.getHoldingID()+"\">sell</A>"%></B></TD>
+								</TR>
+								<% 
 	}
 }
 catch (Exception e)
@@ -165,57 +177,63 @@
      Log.error("portfolio.jsp: error displaying user holdings", e);
 }
 				%>
-                                <TR align="center">
-                                    <TD></TD>
-                                    <TD></TD>
-                                    <TD></TD>
-                                    <TD></TD>
-                                    <TD></TD>
-                                    <TD><B>Total</B></TD>
-                                    <TD align="center">$<%= totalBasis %></TD>
-                                    <TD align="center">$<%= totalValue %></TD>
-                                    <TD align="center" colspan="2">$<%= FinancialUtils.printGainHTML(totalGain) %> <%= FinancialUtils.printGainPercentHTML(FinancialUtils.computeGainPercent(totalValue, totalBasis)) %></TD>
-                                </TR>
-                            </TBODY>
-                        </TABLE>
-                        <CENTER></CENTER>
-                        </TD>
-                    </TR>
-                    <TR>
-                        <TD colspan="6"></TD>
-                    </TR>
-               </TBODY>
-            </TABLE>
-            </TD>
-        </TR>
-    </TBODY>
+								<TR align="center">
+									<TD></TD>
+									<TD></TD>
+									<TD></TD>
+									<TD></TD>
+									<TD></TD>
+									<TD><B>Total</B></TD>
+									<TD align="center">$<%= totalBasis %></TD>
+									<TD align="center">$<%= totalValue %></TD>
+									<TD align="center" colspan="2">$<%= FinancialUtils.printGainHTML(totalGain) %>
+									<%= FinancialUtils.printGainPercentHTML(FinancialUtils.computeGainPercent(totalValue, totalBasis)) %></TD>
+								</TR>
+							</TBODY>
+						</TABLE>
+						<CENTER></CENTER>
+						</TD>
+					</TR>
+					<TR>
+						<TD colspan="6"></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+	</TBODY>
 </TABLE>
 <TABLE height="54" style="font-size: smaller">
-  <TBODY>
-        <TR>
-            <TD colspan="2">
-            <HR>
-            </TD>
-        </TR>
-        <TR>
-            <TD colspan="2">
-            <TABLE width="100%" style="font-size: smaller">
-                <TBODY>
-                    <TR>
-                        <TD>Note: Click any <A href="docs/glossary.html">symbol</A> for a quote or to trade.</TD>
-                        <TD align="right"><FORM><INPUT type="submit" name="action" value="quotes"> <INPUT size="20" type="text" name="symbols" value="s:0, s:1, s:2, s:3, s:4"></FORM></TD>
-                    </TR>
-                </TBODY>
-            </TABLE>
-            </TD>
-        </TR>
-        <TR>
-			<TD align="center" bgcolor="#000000" width="640" height="10"><FONT
-				color="#ffffff"><B>DayTrader Portfolio</B></FONT></TD>
-			<TD align="center" bgcolor="#ffffff" width="100" height="10">
-			    <IMG src="images/spacer.gif" width="45" height="19" border="0"></TD>
+	<TBODY>
+		<TR>
+			<TD colspan="2">
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD colspan="2">
+			<TABLE width="100%" style="font-size: smaller">
+				<TBODY>
+					<TR>
+						<TD>Note: Click any <A href="docs/glossary.html">symbol</A> for a
+						quote or to trade.</TD>
+						<TD align="right">
+						<FORM action=""><INPUT type="submit" name="action" value="quotes">
+						<INPUT size="20" type="text" name="symbols"
+							value="s:0, s:1, s:2, s:3, s:4"></FORM>
+						</TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
+				color="#ffffff">DayTrader Portfolio</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
 		</TR>
-    </TBODY>
+	</TBODY>
 </TABLE>
 </BODY>
 </HTML>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/quoteImg.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/quoteImg.jsp?rev=396334&r1=396333&r2=396334&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/quoteImg.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/quoteImg.jsp Sun Apr 23 15:38:12 2006
@@ -16,11 +16,11 @@
 		<TR>
 			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
 				color="#ffffff">DayTrader Quotes</FONT></B></TD>
-			<TD align="center" bgcolor="#ffffff" width="100" height="10"><IMG
-				src="images/tradeLogo.gif" width="45" height="19" border="0" alt=""></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
 		</TR>
 		<TR align="left">
-			<TD><A href="app?action=home"><IMG src="images/home.gif" width="80"
+			<TD><A href="app?action=home"><IMG src="images/menuHome.gif" width="80"
 				height="20" border="0" alt=""></A></TD>
 			<TD><A href="app?action=account"><IMG src="images/account.gif"
 				width="80" height="20" border="0" alt=""></A></TD>
@@ -171,10 +171,10 @@
 			</TD>
 		</TR>
 		<TR>
-			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
 				color="#ffffff">DayTrader Quotes</FONT></B></TD>
-			<TD align="center" bgcolor="#ffffff" width="100" height="10">
-			     <IMG src="images/tradeLogo.gif" width="45" height="19" border="0"></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
 		</TR>
 		<TR>
 			<TD colspan="2" align="center">

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/register.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/register.jsp?rev=396334&r1=396333&r2=396334&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/register.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/register.jsp Sun Apr 23 15:38:12 2006
@@ -26,7 +26,7 @@
 		</TR>
 	</TBODY>
 </TABLE>
-<TABLE width="100%" height="30">
+<TABLE width="740" height="30">
 	<TBODY>
 		<TR>
 			<TD align="center"></TD>
@@ -35,7 +35,7 @@
 		</TR>
 	</TBODY>
 </TABLE>
-<TABLE width="90%">
+<TABLE width="665">
 	<TBODY>
 		<TR>
 			<TD width="2%" bgcolor="#e7e4e7"></TD>
@@ -46,7 +46,7 @@
 	</TBODY>
 </TABLE>
 <FORM action="app">
-<TABLE width="90%">
+<TABLE width="665">
 	<TBODY align="right">
 		<TR>
 			<TD width="2%" bgcolor="#e7e4e7" rowspan="11"></TD>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/registerImg.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/registerImg.jsp?rev=396334&r1=396333&r2=396334&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/registerImg.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/registerImg.jsp Sun Apr 23 15:38:12 2006
@@ -26,7 +26,7 @@
 		</TR>
 	</TBODY>
 </TABLE>
-<TABLE width="610" height="30">
+<TABLE width="740" height="30">
 	<TBODY>
 		<TR>
 			<TD align="center"></TD>
@@ -36,7 +36,7 @@
 		</TR>
 	</TBODY>
 </TABLE>
-<TABLE width="90%">
+<TABLE width="665">
 	<TBODY>
 		<TR>
 			<TD width="2%" bgcolor="#e7e4e7"></TD>
@@ -47,7 +47,7 @@
 	</TBODY>
 </TABLE>
 <FORM action="app">
-<TABLE width="90%">
+<TABLE width="665">
 	<TBODY align="right">
 		<TR>
 			<TD width="2%" bgcolor="#e7e4e7" rowspan="11"></TD>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/tradehomeImg.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/tradehomeImg.jsp?rev=396334&r1=396333&r2=396334&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/tradehomeImg.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/tradehomeImg.jsp Sun Apr 23 15:38:12 2006
@@ -20,11 +20,11 @@
 		<TR>
 			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
 				color="#ffffff">DayTrader Home</FONT></B></TD>
-			<TD align="center" bgcolor="#ffffff" width="100" height="10"><IMG
-				src="images/tradeLogo.gif" width="45" height="19" border="0" alt=""></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
 		</TR>
 		<TR align="left">
-			<TD><A href="app?action=home"><IMG src="images/home.gif" width="80"
+			<TD><A href="app?action=home"><IMG src="images/menuHome.gif" width="80"
 				height="20" border="0" alt=""></A></TD>
 			<TD><A href="app?action=account"><IMG src="images/account.gif"
 				width="80" height="20" border="0" alt=""></A></TD>
@@ -204,7 +204,7 @@
 			</TD>
 		</TR>
 		<TR>
-			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
 				color="#ffffff">DayTrader Home</FONT></B></TD>
 			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
 				color="#ffffff"><B>DayTrader</B></FONT></TD>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html?rev=396334&r1=396333&r2=396334&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html Sun Apr 23 15:38:12 2006
@@ -8,182 +8,240 @@
 
 <BODY bgcolor="#FFFFFF" link="#000099" vlink="#000099">
 <HR>
-<TABLE width="100%">
-  <TBODY>
-    <TR>
-      <TD>
-      <H3>Web and EJB ping tests</H3>
-      </TD>
-      <TD align="right"></TD>
-    </TR>
-  </TBODY>
+<TABLE width="740">
+	<TBODY>
+		<TR>
+			<TD>
+			<H3>Web and EJB Primitive Tests</H3>
+			</TD>
+			<TD align="right"></TD>
+		</TR>
+	</TBODY>
 </TABLE>
 <HR>
-<P><FONT size="-1">The Geronimo performance benchmark sample provides a suite of web primitives. These
-primitives singularly test key operations in the enterprise Java programming model. Links to each of the web
-primitive tests are provided below along with a description of each operation.</P>
-<P>Note that some primitives
-below can have their main operations repeated.  These operations are marked with a red <FONT COLOR="#FF0000">*</FONT>.
-In order to adjust the repetition, change the primitive iteration value in the Trade configuration page.</FONT></P>
-<CENTER>
-<TABLE border="1" width="100%">
-  <TBODY>
-        <TR>
-            <TD colspan="2" bgcolor="#8080c0" align="center"><B><FONT color="#FFFFFF">Web Container ping suite</FONT></B></TD>
-        </TR>
-        <TR>
-      <TD align="center"><FONT size="-1"><A href="PingHtml.html"><FONT face="Times New Roman">PingHtml</FONT></A></FONT></TD>
-      <TD><FONT size="-1">PingHtml is the most basic operation providing
-      access to a simple &quot;Hello World&quot;
-      page of static HTML.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="servlet/ExplicitGC" target="_self"><FONT face="Times New Roman">Explicit GC</FONT></A></FONT></TD>
-      <TD><FONT size="-1">Invoke Garbage Collection on AppServer.  Reports heap statistics after the GC has completed.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="servlet/PingServlet" target="_self"><FONT face="Times New Roman">PingServlet</FONT></A></FONT></TD>
-      <TD><FONT size="-1">PingServlet tests fundamental dynamic HTML creation through server side
-      servlet processing.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="servlet/PingServletWriter" target="_self"><FONT face="Times New Roman">PingServletWriter</FONT></A> </FONT></TD>
-      <TD><FONT size="-1">PingServletWriter extends PingServlet by using a PrintWriter for formatted
-      output vs. the output stream used by PingServlet.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="servlet/PingServlet2Include" target="_self"><FONT face="Times New Roman">PingServlet2Include</FONT></A></FONT><FONT COLOR="#FF0000">*</FONT></TD>
-      <TD><FONT size="-1">PingServlet2Include tests response inclusion. Servlet 1 includes the response
-      of Servlet 2.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="servlet/PingServlet2Servlet" target="_self"><FONT face="Times New Roman">PingServlet2Servlet</FONT></A></FONT></TD>
-      <TD><FONT size="-1">PingServlet2Servlet tests request dispatching. Servlet 1, the controller,
-      creates a new JavaBean object forwards the request with the JavaBean added
-      to Servlet 2. Servlet 2 obtains access to the JavaBean through the Servlet
-      request object and provides dynamic HTML output based on the JavaBean data.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="PingJsp.jsp">PingJSP</A></FONT></TD>
-      <TD><FONT size="-1">PingJSP tests a direct call to JavaServer
-      Page providing server-side dynamic
-      HTML through
-      JSP scripting.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="PingJspEL.jsp">PingJSPEL</A></FONT></TD>
-      <TD><FONT size="-1">PingJSPEL tests a direct call to JavaServer
-      Page providing server-side dynamic HTML through JSP scripting and the usage of the
-      new JSP 2.0 Expression Language.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="servlet/PingServlet2Jsp">PingServlet2JSP</A></FONT></TD>
-      <TD><FONT size="-1">PingServlet2JSP tests a commonly used design
-      pattern, where a request is issued
-      to servlet
-      providing server side control processing.
-      The servlet creates a JavaBean object
-      with
-      dynamically set attributes and forwards
-      the
-      bean to the JSP through a RequestDispatcher
-      The JSP obtains access to the JavaBean
-      and
-      provides formatted display with dynamic
-      HTML
-      output based on the JavaBean data.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="servlet/PingSession1">PingHTTPSession1</A></FONT>
-      </TD>
-      <TD><FONT size="-1">PingHTTPSession1 - <B>SessionID</B> tests fundamental HTTP session function by creating a unique session ID
-      for each individual user. The ID is stored in the users session and is
-      accessed and displayed on each user request.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><FONT size="-1"><A href="servlet/PingSession2">PingHTTPSession2</A></FONT></TD>
-      <TD><FONT size="-1">PingHTTPSession2 <B>session create/destroy </B>further extends the previous test by invalidating
-      the HTTP Session on every 5th user
-      access.
-      This results in testing HTTPSession
-      create
-      and destroy</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><A href="servlet/PingSession3"><FONT size="-1">PingHTTPSession3</FONT></A></TD>
-      <TD><FONT size="-1">PingHTTPSession3 <B>large session object </B>tests the servers ability to manage and persist
-      large HTTPSession data objects. The
-      servlet
-      creates a large custom java object.
-      The class
-      contains multiple data fields and results
-      in 2048 bytes of data. This large session
-      object is retrieved and stored to the
-      session
-      on each user request.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><A href="servlet/PingJDBCRead"><FONT size="-1">PingJDBCRead</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-      <TD><FONT size="-1">PingJDBCRead tests fundamental servlet to JDBC access to a database performing a single-row read using a prepared SQL statment.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><A href="servlet/PingJDBCWrite"><FONT size="-1">PingJDBCWrite</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-      <TD><FONT size="-1">PingJDBCRead tests fundamental servlet to JDBC access to a database performing a single-row write using a prepared SQL statment.</FONT></TD>
-    </TR>
-        <TR>
-            <TD align="center"><A href="servlet/PingServlet2JNDI"><FONT size="-1">PingServlet2JNDI</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">PingServlet2JNDI tests the fundamental J2EE operation of a servlet allocating a JNDI context and performing a JNDI lookup of a JDBC DataSource.</FONT></TD>
-        </TR>
-        <TR>
-            <TD colspan="2" bgcolor="#8080c0" align="center"><B><FONT color="#FFFFFF">EJB Container ping suite</FONT></B></TD>
-        </TR>
-    
-        <TR>
-      <TD align="center"><A href="servlet/PingServlet2Session"><FONT size="-1">PingServlet2SessionEJB</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-      <TD><FONT size="-1">PingServlet2SessionEJB tests key function of a servlet call to a stateless
-      SessionEJB. The SessionEJB performs a simple calculation and returns the
-      result</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><A href="servlet/PingServlet2EntityLocal"><FONT size="-1">PingServlet2EntityEJBLocal</FONT></A><FONT COLOR="#FF0000">*</FONT><BR>
-			<BR><A href="servlet/PingServlet2EntityRemote"><FONT size="-1">PingServlet2EntityEJBRemote</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-      <TD><FONT size="-1">PingServlet2EntityEJB tests key function of a servlet call to an EJB 2.0 Container Managed Entity. In this test the EJB entity represents a single row in the database table. The <B>Local version</B> uses the EJB Local interface while the <B>Remote version</B> uses the Remote EJB interface. (Note: PingServlet2EntityEJBLocal will fail in a multi-tier setup where the Trade Web and EJB apps are seperated.)</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><A href="servlet/PingServlet2Session2Entity"><FONT size="-1">PingServlet2Session2Entity</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-      <TD><FONT size="-1">This tests the full servlet to Session EJB to Entity EJB path to retrieve
-      a single row from the database.</FONT></TD>
-    </TR>
-    <TR>
-      <TD align="center"><A href="servlet/PingServlet2Session2EntityCollection"><FONT size="-1">PingServlet2Session2<BR>
-            EntityCollection</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-      <TD><FONT size="-1">This test extends the previous EJB Entity test by calling a Session EJB which uses a finder method on the Entity that returns a collection of Entity objects. Each object is displayed by the servlet</FONT></TD>
-    </TR>    
-    <TR>
-      <TD align="center"><A href="servlet/PingServlet2Session2CMROne2One"><FONT size="-1">PingServlet2Session2CMROne2One</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-      <TD><FONT size="-1">This test drives an Entity EJB to get another Entity EJB's data through an EJB 2.0 CMR One to One relationship </FONT></TD>
-    </TR>        
-    <TR>
-      <TD align="center"><A href="servlet/PingServlet2Session2CMROne2Many"><FONT size="-1">PingServlet2Session2CMROne2Many</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-      <TD><FONT size="-1">This test drives an Entity EJB to get another Entity EJB's data through an EJB 2.0 CMR One to Many relationship </FONT></TD>
-    </TR>
-        <TR>
-            <TD align="center"><A href="servlet/PingServlet2MDBQueue"><FONT size="-1">PingServlet2MDBQueue</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">PingServlet2MDBQueue drives messages to a Queue based Message Driven EJB (MDB).Each request to the servlet posts a message to the Queue. The MDB receives the message asynchronously and prints message delivery statistics on each 100th message.</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="servlet/PingServlet2MDBTopic"><FONT size="-1">PingServlet2MDBTopic</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">PingServlet2MDBTopic drives messages to a Topic based Publish/Subscribe Message Driven EJB (MDB).Each request to the servlet posts a message to the Topic. The TradeStreamMDB receives the message asynchronously and prints message delivery statistics on each 100th message. Other subscribers to the Topic will also receive the messages.</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="servlet/PingServlet2TwoPhase"><FONT size="-1">PingServlet2TwoPhase</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">PingServlet2TwoPhase drives a Session EJB which invokes an Entity EJB with findByPrimaryKey (DB Access) followed by posting a message to an MDB through a JMS Queue (Message access). These operations are wrapped in a global 2-phase transaction and commit.</FONT></TD>
-        </TR>
-    </TBODY>
+
+
+<TABLE border="1" width="740">
+	<TBODY>
+		<TR>
+			<TD colspan="1" bgcolor="#8080c0" align="center"><B><FONT
+				color="#FFFFFF">Primitive Test Suite</FONT></B></td>
+		</TR>
+		<TR>
+		    <TD>
+			<P>The Geronimo performance benchmark sample provides
+			a suite of web primitives. These primitives singularly test key
+			operations in the enterprise Java programming model. Links to each of
+			the web primitive tests are provided below along with a description
+			of each operation.</P>
+			<P>Note that some primitives below can have their main operations
+			repeated. These operations are marked with a red 
+			<FONT COLOR="#FF0000">*</FONT>. In order to adjust the repetition, change
+			the primitive iteration value in the Trade configuration page.<FONT></FONT></P>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+
+<TABLE border="1" width="740">
+	<TBODY>
+		<TR>
+			<TD colspan="2" bgcolor="#8080c0" align="center"><B><FONT
+				color="#FFFFFF">Web Container ping suite</FONT></B></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A href="PingHtml.html"><FONT
+				face="Times New Roman">PingHtml</FONT></A></FONT></TD>
+			<TD><FONT size="-1">PingHtml is the most basic operation providing
+			access to a simple &quot;Hello World&quot; page of static HTML.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A href="servlet/ExplicitGC"
+				target="_self"><FONT face="Times New Roman">Explicit GC</FONT></A></FONT></TD>
+			<TD><FONT size="-1">Invoke Garbage Collection on AppServer. Reports
+			heap statistics after the GC has completed.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A href="servlet/PingServlet"
+				target="_self"><FONT face="Times New Roman">PingServlet</FONT></A></FONT></TD>
+			<TD><FONT size="-1">PingServlet tests fundamental dynamic HTML
+			creation through server side servlet processing.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A
+				href="servlet/PingServletWriter" target="_self"><FONT
+				face="Times New Roman">PingServletWriter</FONT></A> </FONT></TD>
+			<TD><FONT size="-1">PingServletWriter extends PingServlet by using a
+			PrintWriter for formatted output vs. the output stream used by
+			PingServlet.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A
+				href="servlet/PingServlet2Include" target="_self"><FONT
+				face="Times New Roman">PingServlet2Include</FONT></A></FONT><FONT
+				COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingServlet2Include tests response inclusion.
+			Servlet 1 includes the response of Servlet 2.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A
+				href="servlet/PingServlet2Servlet" target="_self"><FONT
+				face="Times New Roman">PingServlet2Servlet</FONT></A></FONT></TD>
+			<TD><FONT size="-1">PingServlet2Servlet tests request dispatching.
+			Servlet 1, the controller, creates a new JavaBean object forwards the
+			request with the JavaBean added to Servlet 2. Servlet 2 obtains
+			access to the JavaBean through the Servlet request object and
+			provides dynamic HTML output based on the JavaBean data.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A href="PingJsp.jsp">PingJSP</A></FONT></TD>
+			<TD><FONT size="-1">PingJSP tests a direct call to JavaServer Page
+			providing server-side dynamic HTML through JSP scripting.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A href="PingJspEL.jsp">PingJSPEL</A></FONT></TD>
+			<TD><FONT size="-1">PingJSPEL tests a direct call to JavaServer Page
+			providing server-side dynamic HTML through JSP scripting and the
+			usage of the new JSP 2.0 Expression Language.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A href="servlet/PingServlet2Jsp">PingServlet2JSP</A></FONT></TD>
+			<TD><FONT size="-1">PingServlet2JSP tests a commonly used design
+			pattern, where a request is issued to servlet providing server side
+			control processing. The servlet creates a JavaBean object with
+			dynamically set attributes and forwards the bean to the JSP through a
+			RequestDispatcher The JSP obtains access to the JavaBean and provides
+			formatted display with dynamic HTML output based on the JavaBean
+			data.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A href="servlet/PingSession1">PingHTTPSession1</A></FONT>
+			</TD>
+			<TD><FONT size="-1">PingHTTPSession1 - <B>SessionID</B> tests
+			fundamental HTTP session function by creating a unique session ID for
+			each individual user. The ID is stored in the users session and is
+			accessed and displayed on each user request.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><FONT size="-1"><A href="servlet/PingSession2">PingHTTPSession2</A></FONT></TD>
+			<TD><FONT size="-1">PingHTTPSession2 <B>session create/destroy </B>further
+			extends the previous test by invalidating the HTTP Session on every
+			5th user access. This results in testing HTTPSession create and
+			destroy</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingSession3"><FONT size="-1">PingHTTPSession3</FONT></A></TD>
+			<TD><FONT size="-1">PingHTTPSession3 <B>large session object </B>tests
+			the servers ability to manage and persist large HTTPSession data
+			objects. The servlet creates a large custom java object. The class
+			contains multiple data fields and results in 2048 bytes of data. This
+			large session object is retrieved and stored to the session on each
+			user request.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingJDBCRead"><FONT size="-1">PingJDBCRead</FONT></A><FONT
+				COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingJDBCRead tests fundamental servlet to JDBC
+			access to a database performing a single-row read using a prepared
+			SQL statment.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingJDBCWrite"><FONT size="-1">PingJDBCWrite</FONT></A><FONT
+				COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingJDBCRead tests fundamental servlet to JDBC
+			access to a database performing a single-row write using a prepared
+			SQL statment.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingServlet2JNDI"><FONT size="-1">PingServlet2JNDI</FONT></A><FONT
+				COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingServlet2JNDI tests the fundamental J2EE
+			operation of a servlet allocating a JNDI context and performing a
+			JNDI lookup of a JDBC DataSource.</FONT></TD>
+		</TR>
+		<TR>
+			<TD colspan="2" bgcolor="#8080c0" align="center"><B><FONT
+				color="#FFFFFF">EJB Container ping suite</FONT></B></TD>
+		</TR>
+
+		<TR>
+			<TD align="center"><A href="servlet/PingServlet2Session"><FONT
+				size="-1">PingServlet2SessionEJB</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingServlet2SessionEJB tests key function of a
+			servlet call to a stateless SessionEJB. The SessionEJB performs a
+			simple calculation and returns the result</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingServlet2EntityLocal"><FONT
+				size="-1">PingServlet2EntityEJBLocal</FONT></A><FONT COLOR="#FF0000">*</FONT><BR>
+			<BR>
+			<A href="servlet/PingServlet2EntityRemote"><FONT size="-1">PingServlet2EntityEJBRemote</FONT></A><FONT
+				COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingServlet2EntityEJB tests key function of a
+			servlet call to an EJB 2.0 Container Managed Entity. In this test the
+			EJB entity represents a single row in the database table. The <B>Local
+			version</B> uses the EJB Local interface while the <B>Remote version</B>
+			uses the Remote EJB interface. (Note: PingServlet2EntityEJBLocal will
+			fail in a multi-tier setup where the Trade Web and EJB apps are
+			seperated.)</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingServlet2Session2Entity"><FONT
+				size="-1">PingServlet2Session2Entity</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">This tests the full servlet to Session EJB to
+			Entity EJB path to retrieve a single row from the database.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A
+				href="servlet/PingServlet2Session2EntityCollection"><FONT size="-1">PingServlet2Session2<BR>
+			EntityCollection</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">This test extends the previous EJB Entity test by
+			calling a Session EJB which uses a finder method on the Entity that
+			returns a collection of Entity objects. Each object is displayed by
+			the servlet</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingServlet2Session2CMROne2One"><FONT
+				size="-1">PingServlet2Session2CMROne2One</FONT></A><FONT
+				COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">This test drives an Entity EJB to get another
+			Entity EJB's data through an EJB 2.0 CMR One to One relationship </FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingServlet2Session2CMROne2Many"><FONT
+				size="-1">PingServlet2Session2CMROne2Many</FONT></A><FONT
+				COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">This test drives an Entity EJB to get another
+			Entity EJB's data through an EJB 2.0 CMR One to Many relationship </FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingServlet2MDBQueue"><FONT
+				size="-1">PingServlet2MDBQueue</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingServlet2MDBQueue drives messages to a Queue
+			based Message Driven EJB (MDB).Each request to the servlet posts a
+			message to the Queue. The MDB receives the message asynchronously and
+			prints message delivery statistics on each 100th message.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingServlet2MDBTopic"><FONT
+				size="-1">PingServlet2MDBTopic</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingServlet2MDBTopic drives messages to a Topic
+			based Publish/Subscribe Message Driven EJB (MDB).Each request to the
+			servlet posts a message to the Topic. The TradeStreamMDB receives the
+			message asynchronously and prints message delivery statistics on each
+			100th message. Other subscribers to the Topic will also receive the
+			messages.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="servlet/PingServlet2TwoPhase"><FONT
+				size="-1">PingServlet2TwoPhase</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingServlet2TwoPhase drives a Session EJB which
+			invokes an Entity EJB with findByPrimaryKey (DB Access) followed by
+			posting a message to an MDB through a JMS Queue (Message access).
+			These operations are wrapped in a global 2-phase transaction and
+			commit.</FONT></TD>
+		</TR>
+	</TBODY>
 </TABLE>
-</CENTER>
-<CENTER>
-</CENTER>
-<HR>
 </BODY>
 </HTML>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/welcomeImg.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/welcomeImg.jsp?rev=396334&r1=396333&r2=396334&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/welcomeImg.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/welcomeImg.jsp Sun Apr 23 15:38:12 2006
@@ -19,8 +19,7 @@
 <TABLE width="617" height="30">
 	<TBODY>
 		<TR>
-			<TD><IMG src="images/GLogo_450x50.gif" width="150" height="21"
-				border="0" alt=""></TD>
+			<TD width="150" height="21"></TD>
 			<TD><FONT color="#ff0033"><FONT color="#ff0033"><FONT color="#ff0033"><% String results;
 results = (String) request.getAttribute("results");
 if ( results != null )out.print(results);



Mime
View raw message