geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r395900 [3/5] - in /geronimo/daytrader/trunk: ./ modules/derby/ modules/ear/ modules/ejb/ modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/ modules/ejb/s...
Date Fri, 21 Apr 2006 14:36:27 GMT
Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/accountImg.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/accountImg.jsp?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/accountImg.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/accountImg.jsp Fri Apr 21 07:36:22 2006
@@ -2,163 +2,190 @@
 <HTML>
 <HEAD>
 <META http-equiv="Content-Style-Type" content="text/css">
-<TITLE>Trade Account information</TITLE>
+<TITLE>DayTrader Account Information</TITLE>
 <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.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.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="accountData" type="org.apache.geronimo.samples.daytrader.AccountDataBean" scope="request" />
-<jsp:useBean id="accountProfileData" type="org.apache.geronimo.samples.daytrader.AccountProfileDataBean" scope="request"/>
-<jsp:useBean id="orderDataBeans" type="java.util.Collection" scope="request"/>
+<jsp:useBean id="accountData"
+	type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+	scope="request" />
+<jsp:useBean id="accountProfileData"
+	type="org.apache.geronimo.samples.daytrader.AccountProfileDataBean"
+	scope="request" />
+<jsp:useBean id="orderDataBeans" type="java.util.Collection"
+	scope="request" />
 <TABLE height="54">
-  <TBODY>
-    <TR>
-            <TD bgcolor="#8080c0" align="left" width="500" height="10" colspan="5"><FONT color="#ffffff"><B>Trade Account</B></FONT></TD>
-			<TD align="center" bgcolor="#ffffff" width="100" height="10"><IMG src="images/tradeLogo.gif" width="45" height="19" border="0"></TD>
+	<TBODY>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
+				color="#ffffff">DayTrader Account</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
 		</TR>
-        <TR align="center">
-            <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"><FONT color="#ff0000" size="-2"><BR>
+		<TR align="left">
+			<TD><A href="app?action=home"><IMG src="images/home.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=""><FONT color="#ff0000" size="-2"><BR>
 			<%= new java.util.Date() %></FONT></TD>
 		</TR>
-<%
+		<%
 boolean showAllOrders = request.getParameter("showAllOrders")==null?false:true;
 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="620">
-    <TBODY>
-        <TR>
-            <TD valign="top" width="643">
-            <TABLE width="100%">
-                <TBODY>
-                    <TR>
-                        <TD colspan="8"><FONT color="#ff0000"><%= results %></FONT></TD>
-                    </TR>
-                    <TR>
-                        <TD colspan="8" align="left" bgcolor="#cccccc"><B>Account Information</B></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" valign="bottom"><A href="docs/glossary.html">account created:</A></TD>
-                        <TD align="left" valign="bottom" colspan="2"><%= accountData.getCreationDate()
+	<TBODY>
+		<TR>
+			<TD valign="top" width="643">
+			<TABLE width="100%">
+				<TBODY>
+					<TR>
+						<TD colspan="8"><FONT color="#ff0000"><%= results %></FONT></TD>
+					</TR>
+					<TR>
+						<TD colspan="8" align="left" bgcolor="#cccccc"><B>Account
+						Information</B></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">account
+						created:</A></TD>
+						<TD align="left" valign="bottom" colspan="2"><%= accountData.getCreationDate()
 %></TD>
-                        <TD align="right" valign="bottom"><A href="docs/glossary.html">last login: </A></TD>
-                        <TD align="left" valign="bottom" colspan="3"><%= accountData.getLastLogin()
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">last
+						login: </A></TD>
+						<TD align="left" valign="bottom" colspan="3"><%= accountData.getLastLogin()
 %></TD>
-                        <TD align="left" valign="bottom"></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" valign="bottom"><A href="docs/glossary.html">account ID</A></TD>
-                        <TD valign="bottom"><%= accountData.getAccountID()
+						<TD align="left" valign="bottom"></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">account
+						ID</A></TD>
+						<TD valign="bottom"><%= accountData.getAccountID()
 %></TD>
-                        <TD valign="bottom"></TD>
-                        <TD align="right" valign="bottom"><A href="docs/glossary.html">total logins: </A></TD>
-                        <TD valign="bottom"><%= accountData.getLoginCount()
+						<TD valign="bottom"></TD>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">total
+						logins: </A></TD>
+						<TD valign="bottom"><%= accountData.getLoginCount()
 %></TD>
-                        <TD valign="bottom"></TD>
-                        <TD align="right" valign="bottom"><A href="docs/glossary.html">cash balance: </A></TD>
-                        <TD valign="bottom"><%= accountData.getBalance()
+						<TD valign="bottom"></TD>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">cash
+						balance: </A></TD>
+						<TD valign="bottom"><%= accountData.getBalance()
 %></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" valign="bottom"><A href="docs/glossary.html">user ID:</A></TD>
-                        <TD valign="bottom"><%= accountData.getProfileID()
+					</TR>
+					<TR>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">user
+						ID:</A></TD>
+						<TD valign="bottom"><%= accountData.getProfileID()
 %></TD>
-                        <TD valign="bottom"></TD>
-                        <TD align="right" valign="bottom"><A href="docs/glossary.html">total logouts: </A></TD>
-                        <TD valign="bottom"><%= accountData.getLogoutCount()
+						<TD valign="bottom"></TD>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">total
+						logouts: </A></TD>
+						<TD valign="bottom"><%= accountData.getLogoutCount()
 %></TD>
-                        <TD valign="bottom"></TD>
-                        <TD valign="bottom" align="right"><A href="docs/glossary.html">opening balance: </A></TD>
-                        <TD valign="bottom"><%= accountData.getOpenBalance()
+						<TD valign="bottom"></TD>
+						<TD valign="bottom" align="right"><A href="docs/glossary.html">opening
+						balance: </A></TD>
+						<TD valign="bottom"><%= accountData.getOpenBalance()
 %></TD>
-                    </TR>
-                    <TR>
-                        <TD colspan="8"></TD>
-                    </TR>
-                </TBODY>
-            </TABLE>
-            <TABLE width="100%">
-                <TBODY>
+					</TR>
+					<TR>
+						<TD colspan="8"></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			<TABLE width="100%">
+				<TBODY>
 
-                    <TR>
-                        <TD colspan="5" bgcolor="#cccccc"><B>Total Orders: </B><%= orderDataBeans.size()
+					<TR>
+						<TD colspan="5" bgcolor="#cccccc"><B>Total Orders: </B><%= orderDataBeans.size()
 %></TD>
-                        <TD bgcolor="#cccccc" align="right"><B><A href="app?action=account&showAllOrders=true">show all orders</A></B></TD>
-                    </TR>
-                    <TR align="center">
-                        <TD colspan="6">
-                        <TABLE border="1" style="font-size: smaller">
-                            <CAPTION align="bottom"><B>Recent Orders</B></CAPTION>
-                            <TBODY>
-                                <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>
-                                    <TD><A href="docs/glossary.html">price</A></TD>
-                                    <TD><A href="docs/glossary.html">total</A></TD>
-                                </TR>
-                                <% 
+						<TD bgcolor="#cccccc" align="right"><B><A
+							href="app?action=account&amp;showAllOrders=true">show all orders</A></B></TD>
+					</TR>
+					<TR align="center">
+						<TD colspan="6">
+						<TABLE border="1" style="font-size: smaller">
+							<CAPTION align="bottom"><B>Recent Orders</B></CAPTION>
+							<TBODY>
+								<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>
+									<TD><A href="docs/glossary.html">price</A></TD>
+									<TD><A href="docs/glossary.html">total</A></TD>
+								</TR>
+								<% 
 Iterator it = orderDataBeans.iterator();
 int count=0;
 while (it.hasNext()) {
@@ -166,103 +193,127 @@
     	break;
 	OrderDataBean orderData = (OrderDataBean) it.next();                        	
                          %>
-                                <TR bgcolor="#fafcb6" align="center">
-                                    <TD><%= orderData.getOrderID() %></TD>
-                                    <TD><%= orderData.getOrderStatus() %></TD>
-                                    <TD><%= orderData.getOpenDate() %></TD>
-                                    <TD><%= orderData.getCompletionDate() %></TD>
-                                    <TD><%= orderData.getOrderFee() %></TD>
-                                    <TD><%= orderData.getOrderType() %></TD>
-                                    <TD><%= FinancialUtils.printQuoteLink(orderData.getSymbol()) %></TD>
-                                    <TD><%= orderData.getQuantity() %></TD>
-                                    <TD><%= orderData.getPrice() %></TD>
-                                    <TD><%= orderData.getPrice().multiply(new BigDecimal(orderData.getQuantity())) %></TD>
-                                </TR>
-                                <% }
-				%></TBODY>
-                        </TABLE>
-                        </TD>
-                    </TR>
-                    <TR>
-                        <TD colspan="6"></TD>
-                    </TR>
-               </TBODY>
-            </TABLE>                    
-            <TABLE width="100%">
-                <FORM>            
-                <TBODY>                 
-                    <TR>
-                        <TD colspan="6" bgcolor="#cccccc"><B>Account Profile</B></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" valign="top" width="113">
-                        <A href="docs/glossary.html">user ID:</A></TD>
-                        <TD align="left" valign="top" colspan="2" width="228"><INPUT size="30" type="text" maxlength="30" readonly name="userID" value="<%= accountProfileData.getUserID() %>"></TD>
-                        <TD align="right" valign="top" width="73" colspan="2">
-                        <A href="docs/glossary.html">full name: </A></TD>
-                        <TD align="left" valign="top"><INPUT size="30" type="text" maxlength="30" name="fullname" value="<%= accountProfileData.getFullName() %>"></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" width="113"> <A href="docs/glossary.html">password: </A></TD>
-                        <TD colspan="2" width="228"><INPUT size="30" type="password" maxlength="30" name="password" value="<%= accountProfileData.getPassword() %>"> </TD>
-                        <TD align="right" width="73" colspan="2"><A href="docs/glossary.html">address: </A></TD>
-                        <TD><INPUT size="30" type="text" maxlength="30" name="address" value="<%= accountProfileData.getAddress() %>"></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" width="113"> <A href="docs/glossary.html">confirm password: </A><BR>
-                        </TD>
-                        <TD colspan="2" align="left" width="228"><INPUT size="30" type="password" maxlength="30" name="cpassword" value="<%= accountProfileData.getPassword() %>"></TD>
-                        <TD align="right" width="73" colspan="2"><A href="docs/glossary.html">credit card: </A></TD>
-                        <TD align="left"><INPUT size="30" type="text" maxlength="30" name="creditcard" value="<%= accountProfileData.getCreditCard() %>" readonly></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" width="113"><A href="docs/glossary.html">email address: </A></TD>
-                        <TD colspan="2" align="left" width="228"><INPUT size="30" type="text" maxlength="30" name="email" value="<%= accountProfileData.getEmail() %>"></TD>
-                        <TD align="right" width="73" colspan="2"></TD>
-                        <TD align="center"><INPUT type="submit" name="action" value="update_profile"></TD>
-                    </TR>
-                    <TR>
-                        <TD width="113"></TD>
-                        <TD colspan="5"></TD>
-                    </TR>
-                </TBODY>
-			    </FORM>
-            </TABLE>
-            </TD>
-        </TR>
-    </TBODY>
+								<TR bgcolor="#fafcb6" align="center">
+									<TD><%= orderData.getOrderID() %></TD>
+									<TD><%= orderData.getOrderStatus() %></TD>
+									<TD><%= orderData.getOpenDate() %></TD>
+									<TD><%= orderData.getCompletionDate() %></TD>
+									<TD><%= orderData.getOrderFee() %></TD>
+									<TD><%= orderData.getOrderType() %></TD>
+									<TD><%= FinancialUtils.printQuoteLink(orderData.getSymbol()) %></TD>
+									<TD><%= orderData.getQuantity() %></TD>
+									<TD><%= orderData.getPrice() %></TD>
+									<TD><%= orderData.getPrice().multiply(new BigDecimal(orderData.getQuantity())) %></TD>
+								</TR>
+								<% }
+				%>
+							</TBODY>
+						</TABLE>
+						</TD>
+					</TR>
+					<TR>
+						<TD colspan="6"></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			<TABLE width="100%">
+				<FORM action=""></FORM>
+				<TBODY>
+					<TR>
+						<TD colspan="6" bgcolor="#cccccc"><B>Account Profile</B></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="top" width="113"><A
+							href="docs/glossary.html">user ID:</A></TD>
+						<TD align="left" valign="top" colspan="2" width="228"><INPUT
+							size="30" type="text" maxlength="30" readonly name="userID"
+							value="<%= accountProfileData.getUserID() %>"></TD>
+						<TD align="right" valign="top" width="73" colspan="2"><A
+							href="docs/glossary.html">full name: </A></TD>
+						<TD align="left" valign="top"><INPUT size="30" type="text"
+							maxlength="30" name="fullname"
+							value="<%= accountProfileData.getFullName() %>"></TD>
+					</TR>
+					<TR>
+						<TD align="right" width="113"><A href="docs/glossary.html">password:
+						</A></TD>
+						<TD colspan="2" width="228"><INPUT size="30" type="password"
+							maxlength="30" name="password"
+							value="<%= accountProfileData.getPassword() %>"></TD>
+						<TD align="right" width="73" colspan="2"><A
+							href="docs/glossary.html">address: </A></TD>
+						<TD><INPUT size="30" type="text" maxlength="30" name="address"
+							value="<%= accountProfileData.getAddress() %>"></TD>
+					</TR>
+					<TR>
+						<TD align="right" width="113"><A href="docs/glossary.html">confirm
+						password: </A><BR>
+						</TD>
+						<TD colspan="2" align="left" width="228"><INPUT size="30"
+							type="password" maxlength="30" name="cpassword"
+							value="<%= accountProfileData.getPassword() %>"></TD>
+						<TD align="right" width="73" colspan="2"><A
+							href="docs/glossary.html">credit card: </A></TD>
+						<TD align="left"><INPUT size="30" type="text" maxlength="30"
+							name="creditcard"
+							value="<%= accountProfileData.getCreditCard() %>" readonly></TD>
+					</TR>
+					<TR>
+						<TD align="right" width="113"><A href="docs/glossary.html">email
+						address: </A></TD>
+						<TD colspan="2" align="left" width="228"><INPUT size="30"
+							type="text" maxlength="30" name="email"
+							value="<%= accountProfileData.getEmail() %>"></TD>
+						<TD align="right" width="73" colspan="2"></TD>
+						<TD align="center"><INPUT type="submit" name="action"
+							value="update_profile"></TD>
+					</TR>
+					<TR>
+						<TD width="113"></TD>
+						<TD colspan="5"></TD>
+					</TR>
+				</TBODY>
+				<FORM action=""></FORM>
+			</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 bgcolor="#8080c0" align="left" width="500" height="10"><B><FONT color="#ffffff">Trade Account</FONT></B></TD>
-			<TD align="center" bgcolor="#ffffff" width="100" height="10"><IMG src="images/tradeLogo.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"><B><FONT
+				color="#ffffff">DayTrader Account</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
 		</TR>
-        <TR>
-			<TD colspan="4" align="center"> Derived from Original Work Trade 6, Copyright IBM, 2000, Contributed by IBM<BR>
-			Copyright 2005, Apache Software Foundation, Geronimo<BR>
-			<IMG src="images/GLogo_450x50.gif" width="150" height="21" border="0"><BR>
-			<BR>
-			<IMG src="images/ticker-anim.gif" width="385" height="22" border="0" align="middle"></TD>
+		<TR>
+			<TD colspan="4" align="center"><IMG src="images/ticker-anim.gif"
+				width="385" height="22" border="0" align="middle" alt=""></TD>
 		</TR>
-    </TBODY>
+	</TBODY>
 </TABLE>
 </BODY>
 </HTML>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp Fri Apr 21 07:36:22 2006
@@ -1,26 +1,28 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML>
 <HEAD>
-	<META http-equiv="Content-Style-Type" content="text/css">
-	<TITLE>Welcome to Trade</TITLE>
+<META http-equiv="Content-Style-Type" content="text/css">
+<TITLE>Welcome to DayTrader</TITLE>
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099">
-<%@ page import="org.apache.geronimo.samples.daytrader.TradeConfig" session="false" isThreadSafe="true" isErrorPage="false" %>
+<%@ page import="org.apache.geronimo.samples.daytrader.TradeConfig"
+	session="false" isThreadSafe="true" isErrorPage="false"%>
 
 <TABLE style="font-size: smaller">
 	<TBODY>
 		<TR>
-			<TD bgcolor="#8080c0" align="left" width="500" height="10" colspan="5"><FONT color="#ffffff"><B>Trade Configuration</B></FONT></TD>
-			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT color="#ffffff"><B>Trade</B></FONT></TD>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Configuration</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
 		</TR>
 		<TR>
 			<TD colspan="6">
-				<HR>
+			<HR>
 			</TD>
 		</TR>
 		<TR>
-			<TD colspan="6">
-			</TD>
+			<TD colspan="6"></TD>
 		</TR>
 	</TBODY>
 </TABLE>
@@ -34,8 +36,7 @@
 	<TBODY>
 		<TR>
 			<TD></TD>
-			<TD><FONT color="#ff0033"><% out.print(status); %>
-	</FONT></TD>
+			<TD><FONT color="#ff0033"><% out.print(status); %> </FONT></TD>
 			<TD></TD>
 		</TR>
 	</TBODY>
@@ -44,27 +45,26 @@
 }
 %>
 
-<FORM action="config" method="POST">
-	<INPUT type="hidden" name="action" value="updateConfig">
-	
+<FORM action="config" method="POST"><INPUT type="hidden" name="action"
+	value="updateConfig">
+
 <TABLE border="1" width="614">
 	<TBODY>
 		<TR>
-			<TD colspan="2">
-			The Current Trade runtime configuration is detailed
-			below. View and optionally update run-time parameters. &nbsp;<BR>
+			<TD colspan="2">The current DayTrader runtime configuration is
+			detailed below. View and optionally update run-time parameters.
+			&nbsp;<BR>
 			<BR>
 			<B>NOTE: </B>Parameters settings will return to default
 			on&nbsp;server restart. To make configuration settings persistent
 			across application server stop/starts, edit the servlet init
-			parameters for each Trade servlet. This is described in the <A
-				href="docs/tradeFAQ.html">Trade FAQ</A>.<BR>
+			parameters for each DayTrader servlet. This is described in the <A
+				href="docs/tradeFAQ.html">DayTrader FAQ</A>.<BR>
 			<HR>
 			</TD>
 		</TR>
 		<TR>
-			<TD align="left">
-			<B>Run-Time Mode </B>
+			<TD align="left"><B>Run-Time Mode </B>
 			<P align="left"><%String configParm = "RunTimeMode";
 String names[] = TradeConfig.runTimeModeNames;
 int index = TradeConfig.runTimeMode;
@@ -81,20 +81,18 @@
 }
 %></P>
 			</TD>
-			<TD>
-			<BR>
+			<TD><BR>
 			Run Time Mode determines server implementation of the TradeServices
-			to use in the Trade application Enterprise Java Beans including
+			to use in the DayTrader application Enterprise Java Beans including
 			Session, Entity and Message beans or Direct mode which uses direct
-			database and JMS access. See <A href="docs/tradeFAQ.html">DayTrader FAQ</A>
-			for details.<BR>
+			database and JMS access. See <A href="docs/tradeFAQ.html">DayTrader
+			FAQ</A> for details.<BR>
 			</TD>
 		</TR>
 
 
 		<TR>
-			<TD align="left">
-			<B>Order-Processing Mode </B>
+			<TD align="left"><B>Order-Processing Mode </B>
 			<P align="left"><%configParm = "OrderProcessingMode";
 names = TradeConfig.orderProcessingModeNames;
 index = TradeConfig.orderProcessingMode;
@@ -111,20 +109,18 @@
 }
 %></P>
 			</TD>
-			<TD>
-			<BR>
+			<TD><BR>
 			Order Processing Mode determines the mode for completing stock
 			purchase and sell operations. Synchronous mode completes the order
 			immediately. Asynchronous_1-phase mode uses MDB/JMS to queue the
-			order to a Trade broker agent to complete the order.
+			order to a DayTrader broker agent to complete the order.
 			Asychronous_2-Phase performs a 2-phase commit over the EJB Entity/DB
-			and MDB/JMS transactions. See <A href="docs/tradeFAQ.html">Trade FAQ</A>
-			for details. <B></B><BR>
+			and MDB/JMS transactions. See <A href="docs/tradeFAQ.html">DayTrader
+			FAQ</A> for details. <B></B><BR>
 			</TD>
 		</TR>
 		<TR>
-			<TD align="left">
-			<B>Access Mode </B>
+			<TD align="left"><B>Access Mode </B>
 			<P align="left"><%configParm = "AcessMode";
 names = TradeConfig.accessModeNames;
 index = TradeConfig.getAccessMode();
@@ -146,20 +142,18 @@
 			<BR>
 			</B></P>
 			</TD>
-			<TD>
-			<BR>
-			Access Mode determines the protocol used by the DayTrader Web application
-			to access server side services. The Standard mode uses the default
-			Java RMI protocol. The Web Services mode uses the Axis 
+			<TD><BR>
+			Access Mode determines the protocol used by the DayTrader Web
+			application to access server side services. The Standard mode uses
+			the default Java RMI protocol. The Web Services mode uses the Axis
 			implementation of Web Services including SOAP, WSDL and UDDI. <BR>
 			For the Web Services Access mode, set the Web Services Endpoint URL
-			to point to the host and port which is running the Trade Application
-			Web Services module. <BR>
+			to point to the host and port which is running the DayTrader
+			Application Web Services module. <BR>
 			</TD>
 		</TR>
 		<TR>
-			<TD align="left">
-			<B>Scenario Workload Mix</B>
+			<TD align="left"><B>Scenario Workload Mix</B>
 			<P align="left"><%configParm = "WorkloadMix";
 names = TradeConfig.workloadMixNames;
 index = TradeConfig.workloadMix;
@@ -176,16 +170,12 @@
 }
 %></P>
 			</TD>
-			<TD>
-			This setting determines the runtime
-			workload mix of Trade operations when driving the benchmark through
-			TradeScenarioServlet. See <A href="docs/tradeFAQ.html">Trade FAQ</A>
-			for details.
-			</TD>
+			<TD>This setting determines the runtime workload mix of DayTrader
+			operations when driving the benchmark through TradeScenarioServlet.
+			See <A href="docs/tradeFAQ.html">DayTrader FAQ</A> for details.</TD>
 		</TR>
 		<TR>
-			<TD align="left">
-			<B>WebInterface</B>
+			<TD align="left"><B>WebInterface</B>
 			<P align="left"><%configParm = "WebInterface";
 names = TradeConfig.webInterfaceNames;
 index = TradeConfig.webInterface;
@@ -202,12 +192,10 @@
 }
 %></P>
 			</TD>
-			<TD>
-			This setting determines the Web interface
-			technology used, JSPs or JSPs with static images and GIFs.
-			</TD>
+			<TD>This setting determines the Web interface technology used, JSPs
+			or JSPs with static images and GIFs.</TD>
 		</TR>
-<!--		<TR>
+		<!--		<TR>
 			<TD align="left">
 			<B>Caching Type</B>
 			<P align="left"><%configParm = "CachingType";
@@ -230,55 +218,42 @@
 			This setting determines the caching technology used for data caching
 			, DistributedMap, Command Caching or No Caching.
 			</TD>
-		</TR>-->	
+		</TR>-->
 		<TR>
-			<TD colspan="2" align="center">
-				<B>Miscellaneous Settings</B>
-			</TD>
+			<TD colspan="2" align="center"><B>Miscellaneous Settings</B></TD>
 		</TR>
 		<TR>
-			<TD align="left">
-				<B>Trade Max Users </B><BR>
+			<TD align="left"><B>DayTrader Max Users </B><BR>
 			<INPUT size="25" type="text" name="MaxUsers"
-				value=<%=TradeConfig.getMAX_USERS()%>><BR>
+				value="<%=TradeConfig.getMAX_USERS()%>"><BR>
 			<B>Trade Max Quotes</B><BR>
 			<INPUT size="25" type="text" name="MaxQuotes"
-				value=<%=TradeConfig.getMAX_QUOTES()%>>
-			</TD>
-			<TD>
-			By default the Trade database is
-			populated with 500 users (uid:0 - uid:499) and 1000 quotes (s:0 -
-			s:999). <BR>
+				value="<%=TradeConfig.getMAX_QUOTES()%>"></TD>
+			<TD>By default the DayTrader database is populated with 50 users
+			(uid:0 - uid:49) and 100 quotes (s:0 - s:99). <BR>
 			</TD>
 		</TR>
 		<TR>
-			<TD align="left">
-			<B>Primitive Iteration</B><BR>
+			<TD align="left"><B>Primitive Iteration</B><BR>
 			<INPUT size="25" type="text" name="primIterations"
-				value="<%=TradeConfig.getPrimIterations()%>">
-			</TD>
-			<TD>
-			By default the Trade primitives are
-			execute one operation per web request. Change this value to repeat
-			operations multiple times per web request.
-			</TD>
+				value="<%=TradeConfig.getPrimIterations()%>"></TD>
+			<TD>By default the DayTrader primitives are execute one operation per
+			web request. Change this value to repeat operations multiple times
+			per web request.</TD>
 		</TR>
 		<TR>
-			<TD align="left">
-			<INPUT type="checkbox"
+			<TD align="left"><INPUT type="checkbox"
 				<%=TradeConfig.getActionTrace() ? "checked" : ""%>
 				name="EnableActionTrace"> <B><FONT size="-1">Enable operation trace</FONT></B><BR>
 			<INPUT type="checkbox" <%=TradeConfig.getTrace() ? "checked" : ""%>
 				name="EnableTrace"> <B><FONT size="-1">Enable full trace</FONT></B>
 			</TD>
-			<TD>
-				Enable Trade processing trace messages<BR>
+			<TD>Enable DayTrader processing trace messages<BR>
 			</TD>
 		</TR>
 		<TR>
-			<TD colspan="2" align="right">
-				<INPUT type="submit" value="Update Config">
-			</TD>
+			<TD colspan="2" align="right"><INPUT type="submit"
+				value="Update Config"></TD>
 		</TR>
 	</TBODY>
 </TABLE>
@@ -294,14 +269,10 @@
 			<TD colspan="2"></TD>
 		</TR>
 		<TR>
-			<TD bgcolor="#8080c0" align="left" width="500" height="10"><B><FONT
-				color="#ffffff">Trade Configuration</FONT></B></TD>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Configuration</FONT></B></TD>
 			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
-				color="#ffffff"><B>Trade</B></FONT></TD>
-		</TR>
-		<TR>
-            <TD colspan="2" align="center">Apache Geronimo Performance Benchmark Sample DayTrader<BR>
-Copyright 2005, Apache Software Foundation</TD>
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
 		</TR>
 	</TBODY>
 </TABLE>

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=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/contentHome.html (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/contentHome.html Fri Apr 21 07:36:22 2006
@@ -1,4 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><!-- Sample HTML file -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!-- Sample HTML file -->
 
 <HTML>
 <HEAD>
@@ -6,25 +7,44 @@
 <TITLE>Geronimo performance benchmark sample overview</TITLE>
 </HEAD>
 
-<BODY BGCOLOR="#FFFFFF">
+<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">
-<BR>
+<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>
+<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>
+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>
+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>
+</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>
 
 </BODY>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/displayQuote.jsp?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/displayQuote.jsp Fri Apr 21 07:36:22 2006
@@ -1,4 +1,6 @@
-<%@ page import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*, org.apache.geronimo.samples.daytrader.soap.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page
+	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*, org.apache.geronimo.samples.daytrader.soap.*"
+	session="true" isThreadSafe="true" isErrorPage="false"%>
 <% 
     String symbol = request.getParameter("symbol");
     TradeServices tAction=null;
@@ -10,18 +12,21 @@
 		QuoteDataBean quoteData = tAction.getQuote(symbol);
 
  %>
-	<TR align="center" bgcolor="#fafcb6">
-		<TD><%= FinancialUtils.printQuoteLink(quoteData.getSymbol()) %></TD>
-		<TD><%= quoteData.getCompanyName()%></TD>
-		<TD><%= quoteData.getVolume()%></TD>  
-		<TD><%= quoteData.getLow() + " - " + quoteData.getHigh()%></TD>                                                                      
-		<TD nowrap><%= quoteData.getOpen()%></TD>                                    
-		<TD>$ <%= quoteData.getPrice()%></TD>
-		<TD><%= FinancialUtils.printGainHTML(new BigDecimal(quoteData.getChange())) %> <%= FinancialUtils.printGainPercentHTML( FinancialUtils.computeGainPercent(quoteData.getPrice(), quoteData.getOpen())) %></TD>
-		<TD>
-			<FORM><INPUT type="submit" name="action" value="buy"><INPUT type="hidden" name="symbol" value="<%= quoteData.getSymbol()%>"><INPUT size="4" type="text" name="quantity" value="100"></FORM>
-		</TD>
-	</TR>
+<TR align="center" bgcolor="#fafcb6">
+	<TD><%= FinancialUtils.printQuoteLink(quoteData.getSymbol()) %></TD>
+	<TD><%= quoteData.getCompanyName()%></TD>
+	<TD><%= quoteData.getVolume()%></TD>
+	<TD><%= quoteData.getLow() + " - " + quoteData.getHigh()%></TD>
+	<TD nowrap><%= quoteData.getOpen()%></TD>
+	<TD>$ <%= quoteData.getPrice()%></TD>
+	<TD><%= FinancialUtils.printGainHTML(new BigDecimal(quoteData.getChange())) %>
+	<%= FinancialUtils.printGainPercentHTML( FinancialUtils.computeGainPercent(quoteData.getPrice(), quoteData.getOpen())) %></TD>
+	<TD>
+	<FORM action=""><INPUT type="submit" name="action" value="buy"><INPUT
+		type="hidden" name="symbol" value="<%= quoteData.getSymbol()%>"><INPUT
+		size="4" type="text" name="quantity" value="100"></FORM>
+	</TD>
+</TR>
 
 <%
 	}

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/benchmarking.html
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/benchmarking.html?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/benchmarking.html (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/benchmarking.html Fri Apr 21 07:36:22 2006
@@ -2,7 +2,6 @@
 
 <HTML>
 <HEAD>
-<META name="GENERATOR" content="IBM WebSphere Page Designer V3.5.1 for Windows">
 <META http-equiv="Content-Style-Type" content="text/css">
 <TITLE>Benchmarking Details</TITLE>
 </HEAD>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeFAQ.html
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeFAQ.html?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeFAQ.html (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeFAQ.html Fri Apr 21 07:36:22 2006
@@ -2,7 +2,6 @@
 
 <HTML>
 <HEAD>
-<META name="GENERATOR" content="IBM WebSphere Page Designer V3.5.1 for Windows">
 <META http-equiv="Content-Style-Type" content="text/css">
 <TITLE>Frequently Asked Questions</TITLE>
 </HEAD>
@@ -15,107 +14,62 @@
       <TD>
       <H3><FONT face="Times New Roman">Frequently Asked Questions</FONT></H3>
       </TD>
-      <TD align="right"><IMG border="0" src="../images/WEBSPHERE_18P_UNIX.GIF"></TD>
+      <TD align="right"></TD>
     </TR>
   </TBODY>
 </TABLE>
 
-<P>The IBM<SUP>&reg;</SUP> Trade Performance Benchmark Sample for WebSphere<SUP>&reg;</SUP> Application Server (otherwise known as Trade 6) provides a suite of IBM-developed workloads
-for characterizing performance of  WebSphere Application Server. The
-workloads consist of an end-to-end Web application and a full set of Web
+<P>The Apache Software Foundation<SUP>&reg;</SUP> DayTrader Performance Benchmark Sample
+provides a suite of workloads for characterizing performance of J2EE 1.4 Application 
+Servers. The workloads consist of an end-to-end Web application and a full set of Web
 primitives. The applications are a collection of Java<SUP>TM</SUP> classes, Java servlets,
 Java ServerPages<SUP>TM</SUP> (JSP<SUP>TM</SUP>) files and Enterprise JavaBeans<SUP>TM</SUP> (EJB<SUP>TM</SUP>) built to open Java 2 Platform, Enterprise Edition (J2EE<SUP>TM</SUP>) APIs. Together, the Trade application and Web primitives provide versatile and portable test cases that are designed to measure aspects
 of scalability and performance.</P><HR>
 
 <P><FONT size="+1" color="#000099"><B>Application Design</B></FONT></P>
 
-<P><B>What is Trade?</B></P>
-<P>Trade is an end-to-end Web application that is modeled after an on-line stock brokerage.
-Trade leverages J2EE components such as servlets, JSP files, enterprise beans, message-driven beans (MDBs) and Java database connectivity (JDBC<SUP>TM</SUP>) to
+<P><B>What is DayTrader?</B></P>
+<P>DayTrader is an end-to-end Web application that is modeled after an on-line stock brokerage.
+DayTrader leverages J2EE components such as servlets, JSP files, enterprise beans, 
+message-driven beans (MDBs) and Java database connectivity (JDBC<SUP>TM</SUP>) to
 provide a set of user services such as login/logout, stock quotes, buy,
 sell, account details, and so on through  standards-based HTTP and Web services protocols.</P>
 
 <P><B>What are Web Primitives?</B></P>
-<P>The Web primitives leverage the Trade infrastructure to test specific features
-of the WebSphere Application Server J2EE 1.4 programming model. A description of each of the Web 
+<P>The Web primitives leverage the DayTrader infrastructure to test specific features
+of the Application Servers implementing the J2EE 1.4 programming model. A description of each of the Web 
 primitives is provided on the <A href="../web_prmtv.html">main web primitive 
 page</A>.</P>
 
-<P><B>Why is there a Version 6?</B></P>
-<P>The Trade version skipped from Trade 3 directly to Trade 6 in order to match 
-the WebSphere Application Server version.  Trade 6 builds on Trade 3 by extending the
-programming model from J2EE 1.3 to J2EE 1.4.</P>
-
-<P><B>What is new in Version 6?</B></P>
-<P>As previously mentioned, the largest change in Trade 6 has been the conversion
-from J2EE 1.3 to J2EE 1.4. This conversion involves updating the deployment descriptors and has
-little impact on the actual application code. Other changes in Version 6 include:</P>
-<UL>
-    <LI>Changes to the Java Messaging Service (JMS) APIs associated with J2EE 1.4</LI>
-	<LI>Support for <CODE>DistributedMap</CODE> data caching as well as the ability to configure data caching within Trade from the  <A
-		href="../config">Configuration page</A></LI>
-	<LI>Configurable iteration count for a number  the Web primitives</LI>
-    <LI>Two additional primitives to test JSP-based expression language (EL) support and servlet-based includes</LI>
-	<LI>Consolidated installation scripts for single server and cluster configurations</LI>
-	<LI>Updated cluster configuration to support changes associated with the embedded messaging provider</LI>
-</UL>
 
-<P><B>What changes are made to the cluster configuration?</B></P>
-<P>In previous versions of WebSphere Application Server, embedded messaging, based on WebSphere MQSeries<SUP>TM</SUP>, running on a separate node 
-defined outside of the Trade cluster handled the JMS portion of 
-the Trade workload. In this release, the embedded messaging provider is replaced 
-by an in-process, Java-based distributed messaging engine that provides 
-workload management, failover, and partitioning capabilities. These 
-capabilities provide a wide range of configuration options for messaging. To demonstrate the most common configuration  and to high-light several 
-of these capabilities, the following cluster configuration is used for 
-Trade 6.
+<P><B>What software is required to run DayTrader?</B></P>
 <UL>
-    <LI>A messaging engine (ME) is started and mapped to each cluster member.</LI>
-    <LI>The entire cluster is added to the Service Integration Bus (SIB), providing failover and workload 
-    management capabilities for the MEs.</LI>
-    <LI>The TradeBroker queue is localized to the entire cluster, effectively 
-    partitioning the queue across the MEs.</LI>
-    <LI>Tables are added to the existing Trade database by each ME for 
-    internally managing queue and topic messages.</LI>
-</UL>
-<P>For additional details concerning the configuration of JMS in an ND and cluster 
-environment in WebSphere Application Server V6.0, please consult the Information Center.</P>
-
-<HR>
-<P><FONT size="+1" color="#000099"><FONT color="#000099"><B>Installation</B></FONT></FONT></P>
-
-<P><B>What software is required to run Trade 6?</B></P>
-<UL>
-    <LI>WebSphere Application Server V6.0</LI>
-    <LI>DB2<SUP>&reg;</SUP> Universal Database V8.2, DB2 Universal Database for z/OS Version 8, or Oracle<SUP>&reg;</SUP>  10g database</LI>
+    <LI>Any J2EE 1.4 Compliant Application Server</LI>
+    <LI>A database that has a suitable JDBC driver for both XA and non-XA connectivity.</LI>
 </UL>
 
 <P><B>What are the most common configuration scenarios?</B><UL>
-    <LI><B><B>Single server with a remote database</B></B> - The Trade application runs on a stand alone WebSphere Application Server instance. The required database software and the associated Trade database are located on a different system from the Application Server. The Application Server system must have the necessary database client software to connect to the remote database. <B></B></LI>
-	<LI><B>Single server with a local database</B> - Same as the previous scenario; however, the required database software and the associated Trade database are located on
-	the same system as the Application Server.</LI>
-	<LI><B>Horizontally clustered servers</B> - In this scenario, a cluster of application servers (one
-    server per system) run the Trade application in a  Network Deployment (ND) environment.
-    This scenario also requires a remote database.</LI>
+    <LI><B><B>Single server with a remote database</B></B> - The DayTrader application runs on a stand alone WebSphere Application Server instance. The required database software and the associated Trade database are located on a different system from the Application Server. The Application Server system must have the necessary database client software to connect to the remote database. <B></B></LI>
+	<LI><B>Single server with a local database</B> - Same as the previous scenario; however, the required database software and the 
+	associated DayTrader database are located on the same system as the Application Server.</LI>
 </UL>
 
 
 <HR>
 <P><FONT size="+1" color="#000099"><FONT color="#000099"><B>Run-time Configuration</B></FONT></FONT></P>
 
-<P><B>What does the ResetTrade link do?</B></P>
-<P>The ResetTrade link on the configuration page must be clicked between Trade
-runs. This link sets the database to a consistent size by  removing all the newly registered users created during a Trade run. The reset also sets all outstanding orders to a consistent state. Resetting the database to a consistent size ensures repeatable throughput on subsequent Trade runs. </P>
+<P><B>What does the ResetDayTrader link do?</B></P>
+<P>The ResetDayTrader link on the configuration page must be clicked between DayTrader runs. 
+This link sets the database to a consistent size by removing all the newly registered users created during 
+a DayTrader run. The reset also sets all outstanding orders to a consistent state. Resetting the database 
+to a consistent size ensures repeatable throughput on subsequent DayTrader runs. </P>
 
-<P><B>How are the Trade configuration parameters modified?</B></P>
+<P><B>How are the DayTrader configuration parameters modified?</B></P>
 <P>The Trade <A HREF="../config">configuration page</A> provides a dynamic mechanism to set
-the run-time configuration for a Trade run. These settings control the application
-run-time characteristics such as the run-time mode, the
-order processing mode, and other run-time variations supported in Trade. All settings are reset to defaults when the Trade application server is restarted.</P>
-<P><B>Note:</B> To set configuration parameters when running in a <B></B>cluster<B></B>, access each application server in the cluster on its
-internal HTTP port (9080) and configure the  run-time parameters.
-Another solution is to use the method for making settings permanent as
-described in the following section.</P>
+the run-time configuration for a DayTrader run. These settings control the application
+run-time characteristics such as the run-time mode, the order processing mode, and other run-time 
+variations supported in DayTrader. All settings are reset to defaults when the DayTrader application 
+server is restarted.</P>
 
 <P><B>Can you make configuration changes permanent?</B></P>
 <P>Yes. Normally, Trade configuration parameters return to defaults whenever the Trade application 
@@ -124,44 +78,37 @@
 servlet init parameters in the web.xml file of the Trade Web application to change these parameters.</P>
 
 <P><B>What are the run-time modes?</B></P>
-<P>Trade provides two server implementations of the emulated Trade brokerage services.</P>
+<P>DayTrader provides two server implementations of the emulated DayTrader brokerage services.</P>
 <UL>
     <LI><B>EJB</B> - Database access uses EJB 2.1 technology to drive transactional trading operations.</LI>
     <LI><B>Direct</B> - This mode uses database and messaging access through direct JDBC and JMS code.</LI>
 </UL>
 
 <P><B>What are the order processing modes?</B></P>
-<P>Trade provides an asynchronous order processing mode through messaging with MDBs. The order 
+<P>DayTrader provides an asynchronous order processing mode through messaging with MDBs. The order 
 processing mode determines the mode for completing stock purchase and sell operations. Synchronous 
-mode completes the order immediately. Asynchronous mode uses MDB and JMS to queue the order to a TradeBroker agent to complete the order. Asychronous_2-Phase performs a two-phase commit over the EJB 
- database and messaging transactions.</P>
+mode completes the order immediately. Asynchronous mode uses MDB and JMS to queue the order to a 
+TradeBroker agent to complete the order. Asychronous_2-Phase performs a two-phase commit over the EJB 
+database and messaging transactions.</P>
 <UL>   
-	<LI><B>Synchronous</B> - Orders are completed immediately by the Trade session enterprise bean and entity enterprise beans.</LI>
+	<LI><B>Synchronous</B> - Orders are completed immediately by the DayTrader session enterprise bean and entity enterprise beans.</LI>
 	<LI><B>Asynchronous 2-phase</B> - Orders are queued to the TradeBrokerMDB for asynchronous processing.</LI>
 </UL>
 
 <P><B>What are the access modes?</B></P>
-<P>Trade provides multiple access modes to the server-side brokerage services.</P>
+<P>DayTrader provides multiple access modes to the server-side brokerage services.</P>
 <UL>
 	
 	<LI><B>Standard</B> - Servlets access the Trade enterprise beans through the standard RMI protocol</LI>   
-	<LI><B>WebServices</B> - Servlets access Trade services through the Web services implementation in 
-    WebSphere Application Server. Each trading service is available as a standard Web service through the SOAP Remote Procedure Call (RPC) 
-    protocol. Because Trade is wrapped to provide SOAP services, each Trade operation (login, 
-    quote, buy, and son on) is available as a SOAP service.</LI>
+	<LI><B>WebServices</B> - Servlets access DayTrader services through the Web services implementation in 
+    the System Under Test (SUT). Each trading service is available as a standard Web service through the SOAP 
+    Remote Procedure Call (RPC) protocol. Because DayTrader is wrapped to provide SOAP services, each DayTrader
+    operation (login, quote, buy, and son on) is available as a SOAP service.</LI>
 	
 </UL>
 
-<P><B>What are the caching Types?</B></P>
-<P>This setting determines which set of dynamic caching technology is used by Trade for data caching. By default, 
-data caching is disabled in Trade.</P>
-<UL>
-	<LI><B>DistributedMap  </B>- This feature is new in WebSphere Application Server V6.0, providing a general API for storing objects
-    in the dynamic cache service.</LI>
-	<LI><B>Command caching</B> - This caching feature was added to WebSphere Application Server V5.0 for storing command beans in the 
-    dynamic cache service. Support for this feature was added in Trade 3 and carried over to Trade 6.</LI>
 </UL><P><B>What is the Primitive Iteration setting?</B></P>
-<P>By default, the Trade primitives run one operation per Web request. Setting this value alters
+<P>By default, the DayTrader primitives run one operation per Web request. Setting this value alters
 the number of operations performed per client request. This is useful for reducing the amount of work
 that is performed by the Web Container and for stressing other components within the application server.
 
@@ -170,45 +117,62 @@
 <P><FONT size="+1" color="#000099"><FONT color="#000099"><B>Benchmarking</B></FONT></FONT></P>
 
 <P><B>What is the TradeScenario servlet?</B></P>
-<P>The TradeScenario servlet provides a simple mechanism to drive the Trade application.
-The Trade database is initially populated with a set of fictitious users
-with names ranging from <CODE>uid:0</CODE> to <CODE>uid:499</CODE> and a set of stocks ranging from <CODE>s:0</CODE> to <CODE>s:999</CODE>. The TradeScenario servlet emulates
-a population of Web users by generating a specific Trade operation for
-a randomly chosen user on each access to the URL. To run the TradeScenario servlet
- use the single <A HREF="../scenario">TradeScenario URL</A> (http://<I>hostname</I>/trade/scenario) with a load generation tool.</P>
-<P>Although TradeScenario servlet provides a simple mechanism for driving the Trade application, 
+<P>The TradeScenario servlet provides a simple mechanism to drive the DayTrader application.
+The Trade database is initially populated with a set of fictitious users with names ranging 
+from <CODE>uid:0</CODE> to <CODE>uid:49</CODE> and a set of stocks ranging from <CODE>s:0</CODE> to <CODE>s:99</CODE>. 
+The TradeScenario servlet emulates a population of Web users by generating a specific DayTrader operation for
+a randomly chosen user on each access to the URL. To run the TradeScenario servlet  use the single 
+<A HREF="../scenario">TradeScenario URL</A> (http://<I>hostname</I>/daytrader/scenario) with a load generation tool.</P>
+
+<P>Although TradeScenario servlet provides a simple mechanism for driving the DayTrader application, 
 there is a drawback to using this method versus using a series of load generation scripts 
 that drive the operations directly. This servlet consumes processing resources on the server
 to manage incoming clients and dispatch these simple client requests to complex Trade actions. This
 action artificially decreases server throughput because the server is emulating tasks that are normally
  performed by a standard client or a more complex load generation tool.</P>
 
-<P><B>Why does performance decrease over time?</B><P>If Trade runs for an extended time, performance  eventually starts
-to decline. This degradation in throughput is a direct result of new users, orders, and holdings
-accumulating within the Trade database. As the database grows,  queries take longer
-to complete, resulting in higher response times. When the workload is stopped, the 
-<A HREF="../config?action=resetTrade">Reset Trade link</A> can be followed to reset the Trade 
-run-time by logging off all users, removing new registrations, and other
-general cleanup.</P>
-
-<P><B>What is the typical procedure for collecting performance measurements with Trade?</B><P>When Trade is  successfully installed on the application server and the supporting
-database is  populated, you can us the Trade application to collect performance measurements.
-The following list provides the typical process for gathering performance measurements with Trade.</P>
+<P><B>What is the typical procedure for collecting performance measurements with DayTrader?</B>
+<P>When DayTrader is successfully installed on the application server and the supporting
+database is populated, you can us the DayTrader application to collect performance measurements.
+The following list provides the typical process for gathering performance measurements with DayTrader.</P>
 <OL>
-    <LI>Select the  Trade run-time configuration parameters from the <A HREF="../config">configuration page</A> 
-    (EJB, synchronous, and son on).</LI>
-    <LI>Reset the Trade run-time using the <A HREF="../config?action=resetTrade">Reset Trade link</A>.</LI>
-    <LI>Warm-up the application server JVM<SUP>TM</SUP> by applying load for a short period of time. The load generation tool  should access the TradeScenario servlet, 
+    <LI>Select the DayTrader run-time configuration parameters from the <A HREF="../config">configuration 
+    page</A> (EJB, synchronous, and so on).</LI>
+    <LI>Reset the DayTrader run-time using the <A HREF="../config?action=resetTrade">Reset DayTrader link</A>.</LI>
+    <LI>Warm-up the application server JVM<SUP>TM</SUP> by applying load for a short period of time. The load generation tool  
+    may access the TradeScenario servlet, 
     web primitives, or use custom scripts to drive the various operations of TradeApp servlet. To warm-up the
-     JVM, each code path within Trade must be processed at least 3000 times. Remember that the same code path is not necessarily run on each request unless primitives are being 
-    run. Therefore, perform an adequate number of requests to stabilize the 
-    performance results.</LI>
+     JVM, each code path within DayTrader must be processed enough times to esnure that the JIT compiler
+     has compiled and optimzed the application and server paths; generally, about 3000 iterations should do the trick.
+     Remember that the same code path is not necessarily run on each request unless primitives are being 
+    run. Therefore, perform an adequate number of requests to stabilize the performance results.</LI>
     <LI>Stop the load generation tool.</LI>
     <LI>Reset the Trade run-time again</LI>
-    <LI>Restart the load generation tool and record measurements after the driver completes the
-    requests.</LI>
+    <LI>Restart the load generation tool and record measurements after the driver completes the requests.</LI>
     <LI>Repeat steps 5 and 6 to obtain additional measurements.</LI>    
 </OL>
+
+<P><B>Where did DayTrader come from?</B>
+<P>DayTrader was originally an application designed by IBM to test their commercial Application Server.
+The application was designed around common development patterns as well as to use the majority of the 
+J2EE programming model.  The original author was Stan Cox where he developed Trade (the original name) 
+for J2EE 1.3.  Since then Stan has evolved Trade and several other individuals have contributed to the project.
+Christopher Blythe has been instrumental in stabilizing the long running capability of the benchmark and Andrew
+Spyker introduced the Application Clients.  The Application Clients (Streamer and WSAppClient) provide remote
+capability to validate remote J2EE functionality and database consistency as well as provide a remote 
+WebServices client.  Matt Hogstrom has used Trade extensively for performance analysis and brought Trade 
+to the Apache Software Foundation Geronimo Project.  He has removed (hopefully) all WebSphere specific items
+in the application and introduced additional functionality for gathering server compliance information 
+and low-level diagnostic information.</P>
+
+<P><B>Where is it going?</B>
+<P>Version 1.1 of DayTrader represents the first presentation of the application as an Open Source
+version for performance and benchmarking.  Currently it is focused on J2EE 1.4 but needs to be upgraded to 
+J2EE 1.5.  Also, as there is a large number of developers that are not interested in the full J2EE stack,
+DayTrader needs to be updated to be modular such that only the interesting pieces need to be deployed.</P>
+<P>Also, DayTrader needs to incorporate some additional technology such as Spring and Hibernate for 
+performance testing such that comparisons can be made against competing technologies.</P>
+
 
 <HR>
 

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html Fri Apr 21 07:36:22 2006
@@ -1 +1,9 @@
-<HTML><TITLE>Trade Version</TITLE>             <BODY>IBM Trade Performance Benchmark Sample for WebSphere Application Server - Trade 6.0.1 <BR>    Date: 20050413</HTML></BODY>
\ No newline at end of file
+<HTML>
+<TITLE>DayTrader Version</TITLE>
+<BODY>
+DayTrader Performance Benchmark Sample - 1.1
+<BR>Date: 20060418
+<BR>Contact: <A href="mailto:hogstrom@apache.org?subject=Comments about DayTrader Version 1.1">hogstrom@apache.org</A>
+</BODY>
+</HTML>
+<BODY></BODY>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/error.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/error.jsp?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/error.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/error.jsp Fri Apr 21 07:36:22 2006
@@ -5,8 +5,10 @@
 <TABLE>
   <TBODY>
     <TR>
-            <TD bgcolor="#ff0000" align="left" width="500" colspan="5" height="10"><FONT color="#ffffff"><B>Trade Error</B></FONT></TD>
-            <TD align="center" bgcolor="#000000" width="100" height="10"><FONT color="#ffffff"><B>Trade</B></FONT></TD>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Error</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
         </TR>
 
 </TABLE>
@@ -22,9 +24,9 @@
         </TR>
     <TR>
             <TD bgcolor="#e7e4e7" rowspan="4" width="3"></TD>
-            <TD><B><FONT color="#000000">An Error has occured during Trade processing</FONT><FONT size="-2">.</FONT></B><BR>
+            <TD><B><FONT color="#000000">An Error has occured during DayTrader processing</FONT><FONT size="-2">.</FONT></B><BR>
             The stack trace detailing the error follows.
-            <p><b>Please consult the application server error logs (SystemOut.log/SystemErr.log/FFDC) for further details.</b></p>
+            <p><b>Please consult the application server error logs for further details.</b></p>
             </TD>
             <TD bgcolor="#e7e4e7" width="3" rowspan="4"></TD>
         </TR>
@@ -98,8 +100,10 @@
 <TABLE>
   <TBODY>
     <TR>
-            <TD bgcolor="#ff0000" align="left" width="500" colspan="5" height="10"><FONT color="#ffffff"><B>Trade Error</B></FONT></TD>
-            <TD align="center" bgcolor="#000000" width="100" height="10"><FONT color="#ffffff"><B>Trade</B></FONT></TD>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Error</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
         </TR>
     </TBODY>
 </TABLE>

Added: geronimo/daytrader/trunk/modules/web/src/main/webapp/footer.html
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/footer.html?rev=395900&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/footer.html (added)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/footer.html Fri Apr 21 07:36:22 2006
@@ -0,0 +1,25 @@
+<html>
+<head>
+<title>daytrader2_matts_mods</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<!-- ImageReady Slices (daytrader2_matts_mods.psd - Slices: 00, about, bottomRedBar, configuration, copyRight, dayTraderLogo.gif, daytrader2_matts_mods_14, faq, home, primitives, reports, topRedBar, tradingAndPortfolios) -->
+<table id="Table_01" width="785" height="58" border="0" cellpadding="0" cellspacing="0">
+	<tr>
+		<td>
+			<table id="footer" width="784" height="58" border="0" cellpadding="0" cellspacing="0">
+				<tr>
+					<td>
+						<img src="images/bottomRedBar.gif" width="784" height="5" alt=""></td>
+				</tr>
+				<tr>
+					<td>
+						<img src="images/copyRight.gif" width="784" height="53" alt=""></td>
+				</tr>
+			</table></td>
+	</tr>
+</table>
+<!-- End ImageReady Slices -->
+</body>
+</html>
\ No newline at end of file

Added: geronimo/daytrader/trunk/modules/web/src/main/webapp/header.html
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/header.html?rev=395900&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/header.html (added)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/header.html Fri Apr 21 07:36:22 2006
@@ -0,0 +1,87 @@
+<html>
+<head>
+<title>DayTrader Header</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<!-- ImageReady Slices (daytrader2_matts_mods.psd - Slices: 00, about, bottomRedBar, configuration, copyRight, dayTraderLogo.gif, daytrader2_matts_mods_14, faq, home, primitives, reports, topRedBar, tradingAndPortfolios) -->
+<table id="Table_01" width="785" height="90" border="0" cellpadding="0" cellspacing="0">
+	<tr>
+		<td width="1" height="1" rowspan="3">
+			<img src="images/spacer.gif" width="1" height="1" alt=""></td>
+		<td>
+			<table id="header" width="784" height="89" border="0" cellpadding="0" cellspacing="0">
+				<tr>
+					<td colspan="4">
+						<img src="images/dayTraderLogo.gif.gif" width="319" height="53" alt=""></td>
+					<td width="465" height="53" colspan="6">
+						<img src="images/spacer.gif" width="465" height="53" alt=""></td>
+				</tr>
+				<tr>
+					<td>
+						<a href="contentHome.html" target="TradeMainContent"
+							onmouseover="window.status='Choose to see the DayTrader Architecture';  return true;"
+							onmouseout="window.status='';  return true;">
+							<img src="images/home.gif" width="92" height="29" border="0" alt=""></a></td>
+					<td width="1" height="29">
+						<img src="images/spacer.gif" width="1" height="29" alt=""></td>
+					<td>
+						<a href="app" target="TradeMainContent"
+							onmouseover="window.status='Select this tab to log on and trade portfolios.  Users are u:n and passwords are xxx';  return true;"
+							onmouseout="window.status='';  return true;">
+							<img src="images/tradingAndPortfolios.gif" width="140" height="29" border="0" alt=""></a></td>
+					<td colspan="2">
+						<a href="configure.html" target="TradeMainContent"
+							onmouseover="window.status='Allows for runtime configuration of DayTrader';  return true;"
+							onmouseout="window.status='';  return true;">
+							<img src="images/configuration.gif" width="91" height="29" border="0" alt=""></a></td>
+					<td>
+						<img src="images/reports.gif" width="77" height="29" alt=""></td>
+					<td>
+						<a href="web_prmtv.html" target="TradeMainContent"
+							onmouseover="window.status='Primitives used to test various J2EE and Server Features';  return true;"
+							onmouseout="window.status='';  return true;">
+							<img src="images/primitives.gif" width="78" height="29" border="0" alt=""></a></td>
+					<td>
+						<a href="docs/tradeFAQ.html" target="TradeMainContent">
+							<img src="images/faq.gif" width="86" height="29" border="0" alt=""></a></td>
+					<td>
+						<a href="about.html"
+							onmouseover="window.status='About Dialogue box about DayTrader';  return true;"
+							onmouseout="window.status='';  return true;">
+							<img src="images/about.gif" width="123" height="29" border="0" alt=""></a></td>
+					<td width="96" height="29">
+						<img src="images/spacer.gif" width="96" height="29" alt=""></td>
+				</tr>
+				<tr>
+					<td colspan="10">
+						<img src="images/topRedBar.gif" width="784" height="6" alt=""></td>
+				</tr>
+				<tr>
+					<td>
+						<img src="images/spacer.gif" width="92" height="1" alt=""></td>
+					<td>
+						<img src="images/spacer.gif" width="1" height="1" alt=""></td>
+					<td>
+						<img src="images/spacer.gif" width="140" height="1" alt=""></td>
+					<td>
+						<img src="images/spacer.gif" width="86" height="1" alt=""></td>
+					<td>
+						<img src="images/spacer.gif" width="5" height="1" alt=""></td>
+					<td>
+						<img src="images/spacer.gif" width="77" height="1" alt=""></td>
+					<td>
+						<img src="images/spacer.gif" width="78" height="1" alt=""></td>
+					<td>
+						<img src="images/spacer.gif" width="86" height="1" alt=""></td>
+					<td>
+						<img src="images/spacer.gif" width="123" height="1" alt=""></td>
+					<td>
+						<img src="images/spacer.gif" width="96" height="1" alt=""></td>
+				</tr>
+			</table></td>
+	</tr>
+</table>
+<!-- End ImageReady Slices -->
+</body>
+</html>
\ No newline at end of file

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/about.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/about.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/bottomRedBar.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/bottomRedBar.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/configuration.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/configuration.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/copyRight.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/copyRight.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/faq.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/faq.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/home.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/home.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/primitives.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/primitives.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/reports.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/reports.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/topRedBar.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/topRedBar.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/images/tradingAndPortfolios.gif
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/images/tradingAndPortfolios.gif?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
Binary files - no diff available.

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/index.html
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/index.html?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/index.html (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/index.html Fri Apr 21 07:36:22 2006
@@ -4,17 +4,14 @@
 <META http-equiv="Content-Style-Type" content="text/css">
 <TITLE>DayTrader</TITLE>
 </HEAD>
-<FRAMESET rows="106,*" frameborder="0" framespacing="0" border="0">
-<FRAME src="./topBanner.html" scrolling="NO" name="TradeFrameTop">
-    <FRAMESET cols="166,85%" frameborder="NO">
-<FRAME src="./leftMenu.html" scrolling="AUTO" name="TradeFrameLeft">
-<FRAME src="./contentHome.html" name="TradeFrameMain" scrolling="AUTO">
-</FRAMESET>
-    <NOFRAMES>
-<BODY>
-<P>Need browser which supports frames to see
-this page</P>
-</BODY>
-</NOFRAMES>
+<FRAMESET rows="90,*,58" cols="785" frameborder="0" framespacing="0" border="0">
+	<FRAME src="./header.html" scrolling="NO" name="TradeFrameTop" noresize>
+	<FRAME src="./contentHome.html" scrolling="AUTO" name="TradeMainContent" noresize>
+	<FRAME src="./footer.html" name="TradeFrameBottom" scrolling="NO" noresize>
+	<NOFRAMES>
+	<BODY>
+	<P>Need browser which supports frames to see this page</P>
+	</BODY>
+	</NOFRAMES>
 </FRAMESET>
 </HTML>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/marketSummary.jsp?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/marketSummary.jsp Fri Apr 21 07:36:22 2006
@@ -1,4 +1,6 @@
-<%@ page import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*, org.apache.geronimo.samples.daytrader.soap.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page
+	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*, org.apache.geronimo.samples.daytrader.soap.*"
+	session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <%
 TradeServices tAction=null;
@@ -8,30 +10,38 @@
 	tAction = new TradeWebSoapProxy();    
 MarketSummaryDataBean marketSummaryData = tAction.getMarketSummary();
 %>
-            <TABLE border="1" bgcolor="#ffffff" width="100%" style="font-size: smaller">
-                <TBODY>
-                    <TR>
-                        <TD colspan="2" bgcolor="#000000" align="center" height="15"><FONT color="#ffffff"><B>Market Summary<BR><%= marketSummaryData.getSummaryDate() %></B></FONT></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" bgcolor="#fafcb6" height="47" width="100"> <A href="docs/glossary.html">Trade Stock Index (TSIA)</A></TD>
-                        <TD align="center" valign="middle" bgcolor="#ffffff" height="47" width="141"><%= marketSummaryData.getTSIA() %> <%= FinancialUtils.printGainPercentHTML(marketSummaryData.getGainPercent()) %></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" bgcolor="#fafcb6"><A href="docs/glossary.html">Trading Volume</A></TD>
-                        <TD align="center" valign="middle"><%= marketSummaryData.getVolume() %></TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" bgcolor="#fafcb6" width="74"><A href="docs/glossary.html">Top Gainers</A></TD>
-                        <TD bgcolor="#ffffff">
-                        <TABLE width="100%" border="1" height="100%" style="font-size: smaller">
-                            <TBODY>
-                                <TR align="center">
-                                    <TD><A href="docs/glossary.html">symbol</A></TD>
-                                    <TD><A href="docs/glossary.html">price</A></TD>
-                                    <TD><A href="docs/glossary.html">change</A></TD>
-                                </TR>
-                                <%                              
+<TABLE border="1" bgcolor="#ffffff" width="100%"
+	style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD colspan="2" bgcolor="#000000" align="center" height="15"><FONT
+				color="#ffffff"><B>Market Summary<BR>
+			<%= marketSummaryData.getSummaryDate() %></B></FONT></TD>
+		</TR>
+		<TR>
+			<TD align="right" bgcolor="#fafcb6" height="47" width="100"><A
+				href="docs/glossary.html">DayTrader Stock Index (TSIA)</A></TD>
+			<TD align="center" valign="middle" bgcolor="#ffffff" height="47"
+				width="141"><%= marketSummaryData.getTSIA() %> <%= FinancialUtils.printGainPercentHTML(marketSummaryData.getGainPercent()) %></TD>
+		</TR>
+		<TR>
+			<TD align="right" bgcolor="#fafcb6"><A href="docs/glossary.html">Trading
+			Volume</A></TD>
+			<TD align="center" valign="middle"><%= marketSummaryData.getVolume() %></TD>
+		</TR>
+		<TR>
+			<TD align="right" bgcolor="#fafcb6" width="74"><A
+				href="docs/glossary.html">Top Gainers</A></TD>
+			<TD bgcolor="#ffffff">
+			<TABLE width="100%" border="1" height="100%"
+				style="font-size: smaller">
+				<TBODY>
+					<TR align="center">
+						<TD><A href="docs/glossary.html">symbol</A></TD>
+						<TD><A href="docs/glossary.html">price</A></TD>
+						<TD><A href="docs/glossary.html">change</A></TD>
+					</TR>
+					<%                              
 Collection topGainers = marketSummaryData.getTopGainers();
 Iterator gainers = topGainers.iterator();
 int count=0;
@@ -39,29 +49,32 @@
 {
 	QuoteDataBean quoteData = (QuoteDataBean) gainers.next();
 %>
-                                <TR align="center">
-                                    <TD width="24"><%= FinancialUtils.printQuoteLink(quoteData.getSymbol()) %> </TD>
-                                    <TD><%= quoteData.getPrice() %> </TD>
-                                    <TD width="52" nowrap><%= FinancialUtils.printGainHTML(quoteData.getPrice().subtract(quoteData.getOpen())) /*FinancialUtils.printGainPercentHTML(FinancialUtils.computeGainPercent(quoteData.getPrice(), quoteData.getOpen()))*/ %></TD>
-                                </TR>
-                                <%
+					<TR align="center">
+						<TD width="24"><%= FinancialUtils.printQuoteLink(quoteData.getSymbol()) %>
+						</TD>
+						<TD><%= quoteData.getPrice() %></TD>
+						<TD width="52" nowrap><%= FinancialUtils.printGainHTML(quoteData.getPrice().subtract(quoteData.getOpen())) /*FinancialUtils.printGainPercentHTML(FinancialUtils.computeGainPercent(quoteData.getPrice(), quoteData.getOpen()))*/ %></TD>
+					</TR>
+					<%
 }
 %>
-                            </TBODY>
-                        </TABLE>
-                        </TD>
-                    </TR>
-                    <TR>
-                        <TD align="right" height="55" bgcolor="#fafcb6" width="74"> <A href="docs/glossary.html">Top Losers</A></TD>
-                        <TD height="55" bgcolor="#ffffff" width="141">
-                        <TABLE width="100%" border="1" height="100%" style="font-size: smaller">
-                            <TBODY>
-                                <TR align="center">
-                                    <TD><A href="docs/glossary.html">symbol</A></TD>
-                                    <TD><A href="docs/glossary.html">price</A></TD>
-                                    <TD><A href="docs/glossary.html">change</A></TD>
-                                </TR>
-<%
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+		<TR>
+			<TD align="right" height="55" bgcolor="#fafcb6" width="74"><A
+				href="docs/glossary.html">Top Losers</A></TD>
+			<TD height="55" bgcolor="#ffffff" width="141">
+			<TABLE width="100%" border="1" height="100%"
+				style="font-size: smaller">
+				<TBODY>
+					<TR align="center">
+						<TD><A href="docs/glossary.html">symbol</A></TD>
+						<TD><A href="docs/glossary.html">price</A></TD>
+						<TD><A href="docs/glossary.html">change</A></TD>
+					</TR>
+					<%
 Collection topLosers = marketSummaryData.getTopLosers();
 Iterator losers  = topLosers.iterator();
 count=0;
@@ -70,17 +83,18 @@
 {
 	QuoteDataBean quoteData = (QuoteDataBean) losers.next();
 %>
-                                <TR align="center">
-                                    <TD width="24" nowrap> <%= FinancialUtils.printQuoteLink(quoteData.getSymbol()) %> </TD>
-                                    <TD> <%= quoteData.getPrice() %> </TD>
-                                    <TD width="52" nowrap> <%= FinancialUtils.printGainHTML(quoteData.getPrice().subtract(quoteData.getOpen())) /* FinancialUtils.printGainPercentHTML(FinancialUtils.computeGainPercent(quoteData.getPrice(), quoteData.getOpen())) */%></TD>
-                                </TR>
-                                <%
+					<TR align="center">
+						<TD width="24" nowrap><%= FinancialUtils.printQuoteLink(quoteData.getSymbol()) %>
+						</TD>
+						<TD><%= quoteData.getPrice() %></TD>
+						<TD width="52" nowrap><%= FinancialUtils.printGainHTML(quoteData.getPrice().subtract(quoteData.getOpen())) /* FinancialUtils.printGainPercentHTML(FinancialUtils.computeGainPercent(quoteData.getPrice(), quoteData.getOpen())) */%></TD>
+					</TR>
+					<%
 }
 %>
-                            </TBODY>
-                        </TABLE>
-                        </TD>
-                    </TR>
-                </TBODY>
-            </TABLE>
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>



Mime
View raw message