You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/08/28 20:07:54 UTC

svn commit: r808973 [4/7] - in /geronimo/daytrader/trunk: ./ assemblies/ assemblies/daytrader-web-jdbc/ assemblies/daytrader-web-jdbc/src/ assemblies/daytrader-web-jdbc/src/main/ assemblies/daytrader-web-jdbc/src/main/java/ assemblies/daytrader-web-jdb...

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,204 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<HTML>
+<HEAD>
+<META http-equiv="Content-Style-Type" content="text/css">
+<TITLE>Trade: Quotes and Trading</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, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+	session="true" isThreadSafe="true" isErrorPage="false"%>
+
+<TABLE height="54">
+	<TBODY>
+		<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="#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>
+					<%
+	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>
+					<%
+	}
+%>
+
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+		<%
+}
+%>
+	</TBODY>
+</TABLE>
+<TABLE width="650">
+	<TBODY>
+		<TR>
+			<TD>
+			<TABLE width="100%">
+				<TBODY>
+					<TR>
+						<TD></TD>
+					</TR>
+					<TR>
+						<TD bgcolor="#cccccc"><B>Quotes</B></TD>
+					</TR>
+					<TR>
+						<TD align="center">
+						<TABLE border="1" style="font-size: smaller">
+							<TBODY>
+								<TR align="center">
+									<TD><A href="docs/glossary.html">symbol</A></TD>
+									<TD><A href="docs/glossary.html">company</A></TD>
+									<TD><A href="docs/glossary.html">volume</A></TD>
+									<TD><A href="docs/glossary.html">price range</A></TD>
+									<TD><A href="docs/glossary.html">open price</A></TD>
+									<TD><A href="docs/glossary.html">current price</A></TD>
+									<TD><A href="docs/glossary.html">gain/(loss)</A></TD>
+									<TD><A href="docs/glossary.html">trade</A></TD>
+								</TR>
+
+								<% 
+String symbols = request.getParameter("symbols");
+if (symbols == null)
+	symbols = "no_stock_symbol_provided";
+java.util.ArrayList quotes = new java.util.ArrayList();
+java.util.StringTokenizer st = new java.util.StringTokenizer(symbols, " ,");
+while (st.hasMoreElements())
+{
+ 		String symbol = st.nextToken();
+
+                    %>
+								<jsp:include page="displayQuote.jsp" flush="">
+									<jsp:param name="symbol" value="<%= symbol%>" />
+								</jsp:include>
+
+								<% 
+ }
+					%>
+
+							</TBODY>
+						</TABLE>
+						</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 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 Quotes</FONT></B></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">
+			<IMG src="images/ticker-anim.gif" width="385" height="22" border="0"
+				align="middle" alt="">
+			<TD></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/register.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/register.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/register.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/register.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,158 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Trade Registration</TITLE>
+</HEAD>
+<BODY bgcolor="#ffffff" link="#000099">
+<%@ page session="false"%>
+<% 
+String blank = "";
+String fakeCC = "123-fake-ccnum-456";
+String fullname =   request.getParameter ( "Full Name" );
+String snailmail=   request.getParameter ( "snail mail" );
+String email =      request.getParameter ( "email" ); 
+String userID =     request.getParameter ( "user id" ); 
+String money =      request.getParameter ( "money" ); 
+String creditcard = request.getParameter ( "Credit Card Number" );
+String results =   (String) request.getAttribute ( "results" );
+%>
+<TABLE style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Register</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE width="740" height="30">
+	<TBODY>
+		<TR>
+			<TD align="center"></TD>
+			<TD><FONT color="#ff3333"><%= results==null ? blank : results %></FONT></TD>
+			<TD></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE width="665">
+	<TBODY>
+		<TR>
+			<TD width="2%" bgcolor="#e7e4e7"></TD>
+			<TD width="98%" colspan="8"><B>Register</B>
+			<HR>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<FORM action="app">
+<TABLE width="665">
+	<TBODY align="right">
+		<TR>
+			<TD width="2%" bgcolor="#e7e4e7" rowspan="11"></TD>
+			<TD width="33%" colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>Full
+			name:</B></TD>
+			<TD width="20%" colspan="2" align="right"><INPUT size="40"
+				type="text" name="Full Name"
+				value="<%= fullname==null ? blank : fullname %>"></TD>
+			<TD width="2%" bgcolor="#e7e4e7" rowspan="11"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>Address:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="text"
+				name="snail mail" value="<%= snailmail==null ? blank : snailmail %>"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>E-Mail
+			address:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="text"
+				name="email" value="<%= email==null ? blank : email %>"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4">&nbsp;</TD>
+			<TD colspan="2" align="right">&nbsp;</TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>User
+			ID:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="text"
+				name="user id" value="<%= userID==null ? blank : userID %>"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><B><FONT COLOR="#FF0000">*</FONT>Password:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="password"
+				name="passwd"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><B><FONT COLOR="#FF0000">*</FONT>Confirm
+			password:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="password"
+				name="confirm passwd"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4">&nbsp;</TD>
+			<TD colspan="2" align="right">&nbsp;</TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>Opening
+			account balance:</B></TD>
+			<TD colspan="2" align="right">$<B> </B><INPUT size="20" type="text"
+				name="money" value='<%= money==null ? "10000" : money %>'></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><B><FONT COLOR="#FF0000">*</FONT>Credit
+			card number:</B></TD>
+			<TD colspan="2" align="right">&nbsp;&nbsp;<INPUT size="40"
+				type="text" name="Credit Card Number"
+				value="<%= creditcard==null ? fakeCC : creditcard %>" readonly></TD>
+		</TR>
+		<TR>
+			<TD align="center"></TD>
+			<TD align="center"></TD>
+			<TD align="center"></TD>
+			<TD align="center"></TD>
+			<TD align="center"></TD>
+			<TD align="center"><INPUT type="submit" value="Submit Registration"></TD>
+		</TR>
+		<TR>
+			<TD align="right" colspan="6"></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<INPUT type="hidden" name="action" value="register"></FORM>
+<TABLE height="54" style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD colspan="2">
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD colspan="2"></TD>
+		</TR>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Register</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/register.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/registerImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/registerImg.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/registerImg.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/registerImg.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,159 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<HTML>
+<HEAD>
+<TITLE>Trade Registration</TITLE>
+</HEAD>
+<BODY bgcolor="#ffffff" link="#000099">
+<%@ page session="false"%>
+<% 
+String blank = "";
+String fakeCC = "123-fake-ccnum-456";
+String fullname =   request.getParameter ( "Full Name" );
+String snailmail=   request.getParameter ( "snail mail" );
+String email =      request.getParameter ( "email" ); 
+String userID =     request.getParameter ( "user id" ); 
+String money =      request.getParameter ( "money" ); 
+String creditcard = request.getParameter ( "Credit Card Number" );
+String results =   (String) request.getAttribute ( "results" );
+%>
+<TABLE style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Register</FONT></B></TD>
+			<TD align="center" bgcolor="#ffffff" width="100" height="10"><IMG
+				src="images/spacer.gif" border="0" width="45" height="19" alt=""></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE width="740" height="30">
+	<TBODY>
+		<TR>
+			<TD align="center"></TD>
+			<TD><FONT color="#ff3333"><%= results==null ? blank : results %></FONT></TD>
+			<TD width="120" align="right"><IMG src="images/graph.gif" width="32"
+				height="32" border="0" alt=""></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE width="665">
+	<TBODY>
+		<TR>
+			<TD width="2%" bgcolor="#e7e4e7"></TD>
+			<TD width="98%" colspan="8"><B>Register</B>
+			<HR>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<FORM action="app">
+<TABLE width="665">
+	<TBODY align="right">
+		<TR>
+			<TD width="2%" bgcolor="#e7e4e7" rowspan="11"></TD>
+			<TD width="33%" colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>Full
+			name:</B></TD>
+			<TD width="20%" colspan="2" align="right"><INPUT size="40"
+				type="text" name="Full Name"
+				value="<%= fullname==null ? blank : fullname %>"></TD>
+			<TD width="2%" bgcolor="#e7e4e7" rowspan="11"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>Address:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="text"
+				name="snail mail" value="<%= snailmail==null ? blank : snailmail %>"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>E-Mail
+			address:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="text"
+				name="email" value="<%= email==null ? blank : email %>"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4">&nbsp;</TD>
+			<TD colspan="2" align="right">&nbsp;</TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>User
+			ID:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="text"
+				name="user id" value="<%= userID==null ? blank : userID %>"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><B><FONT COLOR="#FF0000">*</FONT>Password:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="password"
+				name="passwd"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><B><FONT COLOR="#FF0000">*</FONT>Confirm
+			password:</B></TD>
+			<TD colspan="2" align="right"><INPUT size="40" type="password"
+				name="confirm passwd"></TD>
+		</TR>
+		<TR>
+			<TD colspan="4">&nbsp;</TD>
+			<TD colspan="2" align="right">&nbsp;</TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><FONT COLOR="#FF0000">*</FONT><B>Opening
+			account balance:</B></TD>
+			<TD colspan="2" align="right">$<B> </B><INPUT size="20" type="text"
+				name="money" value='<%= money==null ? "10000" : money %>'></TD>
+		</TR>
+		<TR>
+			<TD colspan="4" align="right"><B><FONT COLOR="#FF0000">*</FONT>Credit
+			card number:</B></TD>
+			<TD colspan="2" align="right">&nbsp;&nbsp;<INPUT size="40"
+				type="text" name="Credit Card Number"
+				value="<%= creditcard==null ? fakeCC : creditcard %>" readonly></TD>
+		</TR>
+		<TR>
+			<TD align="center"></TD>
+			<TD align="center"></TD>
+			<TD align="center"></TD>
+			<TD align="center"></TD>
+			<TD align="center"></TD>
+			<TD align="center"><INPUT type="submit" value="Submit Registration"></TD>
+		</TR>
+		<TR>
+			<TD align="right" colspan="6"></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<INPUT type="hidden" name="action" value="register"></FORM>
+<TABLE height="54" style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD colspan="2">
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD colspan="2"></TD>
+		</TR>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><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>
+		</TR>
+	</TBODY>
+</TABLE>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/registerImg.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/runStats.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/runStats.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/runStats.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/runStats.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,324 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<HTML>
+<HEAD>
+<META http-equiv="Content-Style-Type" content="text/css">
+<TITLE>Welcome to Trade</TITLE>
+</HEAD>
+<BODY bgcolor="#ffffff" link="#000099">
+<%@ page import="org.apache.geronimo.samples.daytrader.*"
+	session="false" isThreadSafe="true" isErrorPage="false"%>
+
+<jsp:useBean
+	class="org.apache.geronimo.samples.daytrader.RunStatsDataBean"
+	id="runStatsData" scope="request" />
+<% 
+double loginPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.LOGOUT_OP]) / 100.0;
+double logoutPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.LOGOUT_OP]) / 100.0;
+double buyOrderPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.BUY_OP]) / 100.0;
+double sellOrderPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.SELL_OP]) / 100.0;
+double orderPercentage = buyOrderPercentage + sellOrderPercentage;
+double registerPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.REGISTER_OP]) / 100.0;
+                                                            
+int logins = runStatsData.getSumLoginCount()-runStatsData.getTradeUserCount(); //account for each user being logged in up front
+if (logins < 0 ) logins = 0; //no requests before reset
+//double expectedRequests = ((double) logins) / loginPercentage;
+double expectedRequests = (double)TradeConfig.getScenarioCount();
+TradeConfig.setScenarioCount(0);
+
+int verifyPercent = TradeConfig.verifyPercent;
+%>
+<%!// verifies 2 values are w/in tradeConfig.verifyPercent percent
+String verify(double expected, double actual, int verifyPercent)
+{
+	String retVal = "";
+	if ( (expected==0.0) || (actual == 0.0) )
+		return "N/A";
+	double check = (actual / expected) * 100 - 100;
+	//PASS
+	retVal += check +"% ";
+	if ( (check>=(-1.0*verifyPercent)) && (check<=verifyPercent) )
+		retVal += " Pass";
+	else 
+		retVal += " Fail<SUP>4</SUP>";
+	if (check > 0.0)
+		retVal = "+" + retVal;
+//System.out.println("verify --- expected="+expected+" actual="+actual+ " check="+check);		
+	return retVal;
+}
+String verify(int expected, int actual, int verifyPercent)
+{
+	return verify((double)expected, (double)actual, verifyPercent);
+}
+%>
+<DIV align="left">
+
+<TABLE style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
+				color="#ffffff">DayTrader Scenario Runtime Statistics</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE width="639" height="30">
+	<TBODY>
+		<TR>
+			<TD width="228"><B><FONT size="-1" color="#cc0000"><% 
+String status;
+status = (String) request.getAttribute("status");
+if ( status != null )out.print(status);
+%></FONT></B></TD>
+			<TD width="202"></TD>
+			<TD width="187" align="right"><FONT size="-1"><A href="config"
+				target="_self">Modify runtime configuration</A></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</DIV>
+<TABLE width="645">
+	<TBODY>
+		<TR>
+			<TD valign="top" width="643">
+			<TABLE width="100%">
+				<TBODY>
+					<TR align="center">
+						<TD colspan="6">
+						<CENTER></CENTER>
+						<TABLE border="1" style="font-size: smaller" cellpadding="2"
+							cellspacing="0">
+							<COL span="1" align="right">
+							<COL span="1">
+							<COL span="3" align="center">
+							<CAPTION align="bottom"><FONT size="+1"><B>Benchmark scenario
+							statistics</B></FONT></CAPTION>
+							<TBODY>
+								<TR bgcolor="#f3f3f3">
+									<TD colspan="2" align="center"><B>Benchmark runtime
+									configuration summary</B></TD>
+									<TD colspan="3"><B>Value </B></TD>
+								</TR>
+								<TR>
+									<TD colspan="2"><A href="docs/glossary.html">Run-Time Mode</A></TD>
+									<TD colspan="3"><B><%= (TradeConfig.getRunTimeModeNames())[TradeConfig.runTimeMode] %></B></TD>
+								</TR>
+								<TR>
+									<TD colspan="2"><A href="docs/glossary.html">Order-Processing
+									Mode</A></TD>
+									<TD colspan="3"><B><%= (TradeConfig.getOrderProcessingModeNames())[TradeConfig.orderProcessingMode]%></B></TD>
+								</TR>
+								<TR>
+									<TD colspan="2"><A href="docs/glossary.html">Scenario Workload
+									Mix</A></TD>
+									<TD colspan="3"><B><%= (TradeConfig.getWorkloadMixNames())[TradeConfig.workloadMix]%></B></TD>
+								</TR>
+								<TR>
+									<TD colspan="2"><A href="docs/glossary.html">Web Interface</A></TD>
+									<TD colspan="3"><B><%= (TradeConfig.getWebInterfaceNames())[TradeConfig.webInterface]%></B></TD>
+								</TR>
+								<TR>
+									<TD colspan="2"><A href="docs/glossary.html">Active Traders /
+									Trade User population</A></TD>
+									<TD colspan="3"><B><%= runStatsData.getTradeUserCount() %> / <%= TradeConfig.getMAX_USERS() %>
+									</B></TD>
+								</TR>
+								<TR>
+									<TD colspan="2"><A href="docs/glossary.html">Active Stocks /
+									Trade Stock population</A></TD>
+									<TD colspan="3"><B><%= TradeConfig.getMAX_QUOTES() %> / <%= runStatsData.getTradeStockCount() %></B></TD>
+								</TR>
+								<TR>
+									<TD colspan="5" align="center" bgcolor="#f3f3f3"><B>Benchmark
+									scenario verification</B></TD>
+								</TR>
+								<TR bgcolor="#fafcb6" align="center">
+									<TD width="109"><B>Run Statistic</B></TD>
+									<TD><B>Scenario verification test</B></TD>
+									<TD><B>Expected Value</B></TD>
+									<TD width="25"><B>Actual Value</B></TD>
+									<TD><B>Pass/Fail</B></TD>
+								</TR>
+								<TR>
+									<TD>Active Stocks</TD>
+									<TD>Active stocks should generally equal the db population of
+									stocks</TD>
+									<TD><%= runStatsData.getTradeStockCount() %></TD>
+									<TD><B><%= TradeConfig.getMAX_QUOTES() %></B></TD>
+									<TD><%= ( runStatsData.getTradeStockCount() == TradeConfig.getMAX_QUOTES() ) ? "Pass":"Warn" %></TD>
+								</TR>
+								<TR bgcolor="#ffffff">
+									<TD><A href="docs/glossary.html">Active Traders</A></TD>
+									<TD>Active traders should generally equal the db population of
+									traders</TD>
+									<TD><%= runStatsData.getTradeUserCount() %></TD>
+									<TD><B><%= TradeConfig.getMAX_USERS() %></B></TD>
+									<TD><%= ( runStatsData.getTradeUserCount() == TradeConfig.getMAX_USERS() ) ? "Pass":"Warn" %></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">Estimated total requests</A></TD>
+									<TD>Actual benchmark scenario requests should be within +/- 2%
+									of the estimated number of requests in the last benchmark run
+									to pass.</TD>
+									<TD><%= expectedRequests %></TD>
+									<TD><B>see</B><B><SUP>2</SUP></B></TD>
+									<TD>see<SUP>2</SUP></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">New Users Registered </A></TD>
+									<TD><%= registerPercentage * 100 %>% of expected requests (<%= registerPercentage%>
+									* <%= expectedRequests %> )</TD>
+									<TD><%= registerPercentage * expectedRequests %></TD>
+									<TD><B><%= runStatsData.getNewUserCount() %></B></TD>
+									<TD><%= verify(registerPercentage * expectedRequests, (double)runStatsData.getNewUserCount(), verifyPercent) %></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">Logins </A></TD>
+									<TD><%= loginPercentage * 100 %>% of expected requests (<%= loginPercentage%>
+									* <%= expectedRequests %> ) + initial login</TD>
+									<TD><%= loginPercentage * expectedRequests + runStatsData.getTradeUserCount()  %></TD>
+									<TD><B><%= runStatsData.getSumLoginCount() + runStatsData.getTradeUserCount()  %></B></TD>
+									<TD><%= verify((double)loginPercentage * expectedRequests, (double)runStatsData.getSumLoginCount(), verifyPercent)%></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">Logouts </A></TD>
+									<TD>#logouts must be &gt;= #logins-active traders ( <%= runStatsData.getSumLoginCount() %>
+									- <%= TradeConfig.getMAX_USERS() %> )</TD>
+									<TD><%= runStatsData.getSumLoginCount()- TradeConfig.getMAX_USERS() %></TD>
+									<TD><B><%= runStatsData.getSumLogoutCount() %></B></TD>
+									<TD><%= (runStatsData.getSumLogoutCount() >= (runStatsData.getSumLoginCount()- TradeConfig.getMAX_USERS())) ? "Pass" : "Fail<SUP>4</SUP>" %>
+									</TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">User Holdings </A></TD>
+									<TD>Trade users own an average of 5 holdings, 5* total Users =
+									( 5 * <%= runStatsData.getTradeUserCount() %>)</TD>
+									<TD><%= 5 * runStatsData.getTradeUserCount() %></TD>
+									<TD><B><%= runStatsData.getHoldingCount() %></B></TD>
+									<TD><%= verify( 5 * runStatsData.getTradeUserCount(), runStatsData.getHoldingCount(), verifyPercent ) %></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">Buy Order Count </A></TD>
+									<TD><%= buyOrderPercentage * 100 %>% of expected requests (<%= buyOrderPercentage%>
+									* <%= expectedRequests %> ) + current holdings count</TD>
+									<TD><%= buyOrderPercentage * expectedRequests + runStatsData.getHoldingCount() %></TD>
+									<TD><B><%= runStatsData.getBuyOrderCount() %></B></TD>
+									<TD><%= verify(buyOrderPercentage * expectedRequests + runStatsData.getHoldingCount() , (double)runStatsData.getBuyOrderCount(), verifyPercent)%></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">Sell Order Count </A></TD>
+									<TD><%= sellOrderPercentage * 100 %>% of expected requests (<%= sellOrderPercentage%>
+									* <%= expectedRequests %> )</TD>
+									<TD><%= sellOrderPercentage * expectedRequests %></TD>
+									<TD><B><%= runStatsData.getSellOrderCount() %></B></TD>
+									<TD><%= verify(sellOrderPercentage * expectedRequests, (double)runStatsData.getSellOrderCount(), verifyPercent)%></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">Total Order Count </A></TD>
+									<TD><%= orderPercentage * 100 %>% of expected requests (<%= orderPercentage%>
+									* <%= expectedRequests %> ) + current holdings count</TD>
+									<TD><%= orderPercentage * expectedRequests + runStatsData.getHoldingCount() %></TD>
+									<TD><B><%= runStatsData.getOrderCount() %></B></TD>
+									<TD><%= verify(orderPercentage * expectedRequests + runStatsData.getHoldingCount(), (double)runStatsData.getOrderCount(), verifyPercent)%></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">Open Orders </A></TD>
+									<TD>All orders should be completed before reset<SUP>3</SUP></TD>
+									<TD>0</TD>
+									<TD><B><%= runStatsData.getOpenOrderCount() %></B></TD>
+									<TD><%= (runStatsData.getOpenOrderCount() > 0) ? "Fail<SUP>4</SUP>" : "Pass" %></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">Cancelled Orders </A></TD>
+									<TD>Orders are cancelled if an error is encountered during
+									order processing.</TD>
+									<TD>0</TD>
+									<TD><B><%= runStatsData.getCancelledOrderCount() %></B></TD>
+									<TD><%= (runStatsData.getCancelledOrderCount() > 0) ? "Fail<SUP>4</SUP>" : "Pass" %></TD>
+								</TR>
+								<TR>
+									<TD><A href="docs/glossary.html">Orders remaining after reset </A></TD>
+									<TD>After Trade reset, each user should carry an average of 5
+									orders in the database. 5* total Users = (5 * <%= runStatsData.getTradeUserCount() %>)</TD>
+									<TD><%= 5 * runStatsData.getTradeUserCount() %></TD>
+									<TD><B><%= runStatsData.getOrderCount()-runStatsData.getDeletedOrderCount() %></B></TD>
+									<TD><%=  verify( 5 * runStatsData.getTradeUserCount(), runStatsData.getOrderCount()-runStatsData.getDeletedOrderCount(), verifyPercent ) %></TD>
+								</TR>
+							</TBODY>
+						</TABLE>
+						<CENTER>
+						<DIV align="left"></DIV>
+						</CENTER>
+						</TD>
+					</TR>
+					<TR>
+						<TD colspan="6">
+						<OL>
+							<LI><FONT size="-1"> Benchmark verification tests require a Trade
+							Reset between each benchmark run.</FONT></LI>
+							<LI><FONT size="-1">The expected value of benchmark requests is
+							computed based on the the count from the Web application since
+							the last Trade reset.The actual value of benchmark request
+							requires user verification and may be incorrect for a cluster.</FONT></LI>
+							<LI><FONT size="-1">Orders are processed asynchronously in Trade.
+							Therefore, processing may continue beyond the end of a benchmark
+							run. Trade Reset should not be invoked until processing is
+							completed.</FONT></LI>
+							<LI><FONT size="-1">Actual values must be within</FONT><FONT
+								size="-1" color="#cc0000"><FONT size="-1" color="#cc0000"><B> <FONT
+								size="-1" color="#cc0000"><%= TradeConfig.verifyPercent %></FONT>%
+							</B></FONT></FONT><FONT size="-1">of corresponding estimated
+							values to pass verification.</FONT></LI>
+						</OL>
+						</TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<FORM action="config" method="POST"><INPUT type="hidden" name="action"
+	value="updateConfig">
+<TABLE height="54" style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD colspan="2">
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD colspan="2"></TD>
+		</TR>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
+				color="#ffffff">DayTrader Scenario Runtime Statistics</FONT></B></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">Apache Geronimo Performance Benchmark
+			Sample DayTrader<BR>
+			Copyright 2005, Apache Software Foundation</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</FORM>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/runStats.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/sample.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/sample.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/sample.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/sample.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,26 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
+<jsp:useBean id="now" class="java.util.Date" />
+<html>
+<body>
+Hello world JSP on<fmt:formatDate value="${now}" dateStyle="full" />
+</body>
+</html>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/sample.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/style.css
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/style.css?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/style.css (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/style.css Fri Aug 28 18:07:49 2009
@@ -0,0 +1,24 @@
+/*======================================================================
+*   Licensed to the Apache Software Foundation (ASF) under one or more
+*   contributor license agreements.  See the NOTICE file distributed with
+*   this work for additional information regarding copyright ownership.
+*   The ASF licenses this file to You under the Apache License, Version 2.0
+*   (the "License"); you may not use this file except in compliance with
+*   the License.  You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+*   Unless required by applicable law or agreed to in writing, software
+*   distributed under the License is distributed on an "AS IS" BASIS,
+*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*   See the License for the specific language governing permissions and
+*   limitations under the License.
+======================================================================*/
+A:HOVER {
+	text-decoration: underline; color: red;
+}
+
+A:ACTIVE {
+	color: red;
+	font-weight: bold
+}
\ No newline at end of file

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/style.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehome.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehome.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehome.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehome.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,226 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META http-equiv="Content-Style-Type" content="text/css">
+<TITLE>Welcome to DayTrader</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"%>
+<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="holdingDataBeans" type="java.util.Collection"
+	scope="request" />
+<TABLE height="54">
+	<TBODY>
+		<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="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+		<TR align="left">
+			<TD><B><A href="app?action=home">Home</A></B><B> </B></TD>
+			<TD><B><A href="app?action=account">Account</A></B><B> </B></TD>
+			<TD><B><A href="app?action=portfolio">Portfolio</A></B><B> </B></TD>
+			<TD><B><A href="app?action=quotes&amp;symbols=s:0,s:1,s:2,s:3,s:4">Quotes/Trade</A></B></TD>
+			<TD><B><A href="app?action=logout">Logoff</A></B></TD>
+			<TD></TD>
+		</TR>
+		<TR>
+			<TD align="right" colspan="6">
+			<HR>
+			<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>
+					<%
+	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>
+					<%
+	}
+%>
+
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+		<%
+}
+%>
+	</TBODY>
+</TABLE>
+<TABLE width="636">
+	<TBODY>
+		<TR>
+			<TD valign="top" width="377">
+			<TABLE width="384">
+				<TBODY>
+					<TR>
+						<TD colspan="3"><B>Welcome &nbsp;<%= accountData.getProfileID() %>,</B></TD>
+					</TR>
+					<TR>
+						<TD width="133"></TD>
+						<TD width="22"></TD>
+						<TD width="212"></TD>
+					</TR>
+					<TR>
+						<TD colspan="3" align="left" bgcolor="#cccccc"><B> User Statistics
+						</B></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="top" width="133"><A
+							href="docs/glossary.html">account ID:<BR>
+						</A><A href="docs/glossary.html">account created:</A><BR>
+						<A href="docs/glossary.html">total logins:</A><BR>
+						<A href="docs/glossary.html">session created:</A><BR>
+						</TD>
+						<TD width="22"></TD>
+						<TD align="left" width="212"><%= accountData.getAccountID()
+%><BR>
+						<%= accountData.getCreationDate()
+%><BR>
+						<%= accountData.getLoginCount()
+%><BR>
+						<%= (java.util.Date) session.getAttribute("sessionCreationDate")
+%><BR>
+						</TD>
+					</TR>
+					<TR>
+						<TD width="133"></TD>
+						<TD width="22"></TD>
+						<TD width="212"></TD>
+					</TR>
+					<TR>
+						<TD colspan="3" bgcolor="#cccccc"><B>Account Summary </B></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="top" width="133"><A
+							href="docs/glossary.html"> cash balance:</A><BR>
+						<A href="docs/glossary.html">number of holdings:</A><BR>
+						<A href="docs/glossary.html">total of holdings:<BR>
+						sum of cash/holdings<BR>
+						opening balance:<BR>
+						</A>
+						<HR>
+						</TD>
+						<TD width="22"></TD>
+						<TD align="left" valign="top" width="212"><% 
+                        	BigDecimal openBalance = accountData.getOpenBalance();
+                        	BigDecimal balance = accountData.getBalance();
+                        	BigDecimal holdingsTotal = FinancialUtils.computeHoldingsTotal(holdingDataBeans);
+                        	BigDecimal sumOfCashHoldings = balance.add(holdingsTotal);
+                        	BigDecimal gain = FinancialUtils.computeGain(sumOfCashHoldings, openBalance);
+							BigDecimal gainPercent = FinancialUtils.computeGainPercent(sumOfCashHoldings, openBalance);
+                         %>$ <%= balance %><BR>
+						<%= holdingDataBeans.size()%><BR>
+						$ <%= holdingsTotal %><BR>
+						$ <%= sumOfCashHoldings %><BR>
+						$ <%= openBalance%><BR>
+
+						<HR>
+						</TD>
+					</TR>
+					<TR>
+						<TD valign="top" align="right"><A href="docs/glossary.html">current
+						gain/(loss):</A></TD>
+						<TD></TD>
+						<TD valign="top">$ <B><%= FinancialUtils.printGainHTML(gain) %> <%= FinancialUtils.printGainPercentHTML(gainPercent) %></B></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+			<TD align="center" valign="top" bgcolor="#ffffff" width="236"><jsp:include
+				page="marketSummary.jsp" flush="" /> <BR>
+			</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 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 Home</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehome.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,237 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!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>
+<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"%>
+<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="holdingDataBeans" type="java.util.Collection"
+	scope="request" />
+<TABLE height="54">
+	<TBODY>
+		<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="#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>
+					<%
+	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>
+					<%
+	}
+%>
+
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+		<%
+}
+%>
+	</TBODY>
+</TABLE>
+<TABLE width="636">
+	<TBODY>
+		<TR>
+			<TD valign="top" width="377">
+			<TABLE width="384">
+				<TBODY>
+					<TR>
+						<TD colspan="3"><B>Welcome &nbsp;<%= accountData.getProfileID() %>,</B></TD>
+					</TR>
+					<TR>
+						<TD width="133"></TD>
+						<TD width="22"></TD>
+						<TD width="212"></TD>
+					</TR>
+					<TR>
+						<TD colspan="3" align="left" bgcolor="#cccccc"><B> User Statistics
+						</B></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="top" width="133"><A
+							href="docs/glossary.html">account ID:<BR>
+						</A><A href="docs/glossary.html">account created:</A><BR>
+						<A href="docs/glossary.html">total logins:</A><BR>
+						<A href="docs/glossary.html">session created:</A><BR>
+						</TD>
+						<TD width="22"></TD>
+						<TD align="left" width="212"><%= accountData.getAccountID()
+%><BR>
+						<%= accountData.getCreationDate()
+%><BR>
+						<%= accountData.getLoginCount()
+%><BR>
+						<%= (java.util.Date) session.getAttribute("sessionCreationDate")
+%><BR>
+						</TD>
+					</TR>
+					<TR>
+						<TD width="133"></TD>
+						<TD width="22"></TD>
+						<TD width="212"></TD>
+					</TR>
+					<TR>
+						<TD colspan="3" bgcolor="#cccccc"><B>Account Summary </B></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="top" width="133"><A
+							href="docs/glossary.html"> cash balance:</A><BR>
+						<A href="docs/glossary.html">number of holdings:</A><BR>
+						<A href="docs/glossary.html">total of holdings:<BR>
+						sum of cash/holdings<BR>
+						opening balance:<BR>
+						</A>
+						<HR>
+						</TD>
+						<TD width="22"></TD>
+						<TD align="left" valign="top" width="212"><% 
+                        	BigDecimal openBalance = accountData.getOpenBalance();
+                        	BigDecimal balance = accountData.getBalance();
+                        	BigDecimal holdingsTotal = FinancialUtils.computeHoldingsTotal(holdingDataBeans);
+                        	BigDecimal sumOfCashHoldings = balance.add(holdingsTotal);
+                        	BigDecimal gain = FinancialUtils.computeGain(sumOfCashHoldings, openBalance);
+							BigDecimal gainPercent = FinancialUtils.computeGainPercent(sumOfCashHoldings, openBalance);
+                         %>$<%= balance %><BR>
+						<%= holdingDataBeans.size()%><BR>
+						$<%= holdingsTotal %><BR>
+						$<%= sumOfCashHoldings %><BR>
+						$<%= openBalance%><BR>
+
+						<HR>
+						</TD>
+					</TR>
+					<TR>
+						<TD valign="top" align="right"><A href="docs/glossary.html">current
+						gain/(loss):</A></TD>
+						<TD></TD>
+						<TD valign="top">$ <B><%= FinancialUtils.printGainHTML(gain) %> <%= FinancialUtils.printGainPercentHTML(gainPercent) %></B></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+			<TD align="center" valign="top" bgcolor="#ffffff" width="236"><jsp:include
+				page="marketSummary.jsp" flush="" /> <BR>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE height="54" style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD colspan="4"><IMG src="images/line.gif" width="600" height="6"
+				border="0" alt=""></TD>
+		</TR>
+		<TR>
+			<TD colspan="4">
+			<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 Home</FONT></B></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">
+			<IMG src="images/ticker-anim.gif" width="385" height="22" border="0"
+				align="middle" alt="">
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/web_prmtv.html
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/web_prmtv.html?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/web_prmtv.html (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/web_prmtv.html Fri Aug 28 18:07:49 2009
@@ -0,0 +1,273 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<HTML>
+<HEAD>
+<META http-equiv="Content-Style-Type" content="text/css">
+<TITLE>Web Primitives</TITLE>
+</HEAD>
+
+<BODY bgcolor="#FFFFFF" link="#000099" vlink="#000099">
+<HR>
+<TABLE width="740">
+	<TBODY>
+		<TR>
+			<TD>
+			<H3>Web Primitive Tests</H3>
+			</TD>
+			<TD align="right"></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<HR>
+
+
+<TABLE border="1" width="740">
+	<TBODY>
+		<TR>
+			<TD colspan="1" bgcolor="#c93333" 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="#c93333" 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="#c93333" align="center"><B><FONT
+				color="#FFFFFF">EJB 3 Container ping suite</FONT></B></TD>
+		</TR>
+
+		<TR>
+			<TD align="center"><A href="ejb3/PingServlet2Session"><FONT
+				size="-1">PingServlet2Session</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingServlet2Session tests key function of a
+			servlet call to a stateless Session EJB. The Session EJB performs a
+			simple calculation and returns the result</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="ejb3/PingServlet2Entity"><FONT
+				size="-1">PingServlet2Entity</FONT></A><FONT COLOR="#FF0000">*</FONT><BR></TD>
+			<TD><FONT size="-1">PingServlet2Entity tests key function of a
+			servlet call to an EJB 3.0 Container Managed Entity. In this test the
+			EJB entity represents a single row in the database table.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="ejb3/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="ejb3/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="ejb3/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 3.0 CMR One to One relationship.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="ejb3/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 3.0 CMR One to Many relationship.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="ejb3/PingServlet2Session2JDBC"><FONT
+				size="-1">PingServlet2Session2JDBC</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">This tests the full servlet to Session EJB to
+			JDBC path to retrieve a single row from the database.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A
+				href="ejb3/PingServlet2Session2JDBCCollection"><FONT size="-1">PingServlet2Session2<BR>
+			JDBCCollection</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">This test extends the previous JDBC test by
+			calling a Session EJB to JDBC path which returns multiple rows
+			from the database.</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="ejb3/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 color="red">
+			<B>Note:</B> Not intended for performance testing.</FONT></FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="ejb3/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 color="red"><B>Note:</B> Not intended for performance 
+			testing.</FONT></FONT></TD>
+		</TR>
+		<TR>
+			<TD align="center"><A href="ejb3/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>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/web_prmtv.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/web_prmtv.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcome.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcome.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcome.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcome.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,121 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Trade Login</TITLE>
+<LINK rel="stylesheet" href="style.css" type="text/css" />
+</HEAD>
+<BODY bgcolor="#ffffff" link="#000099">
+<%@ page session="false"%>
+<TABLE style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Login</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE width="100%" height="30">
+	<TBODY>
+		<TR>
+			<TD></TD>
+			<TD><FONT color="#ff0033"><FONT color="#ff0033"><FONT color="#ff0033"><% String results;
+results = (String) request.getAttribute("results");
+if ( results != null )out.print(results);
+%></FONT></FONT></FONT></TD>
+			<TD></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<DIV align="left"></DIV>
+<TABLE width="616">
+	<TBODY>
+		<TR>
+			<TD width="2%" bgcolor="#e7e4e7" rowspan="3"></TD>
+			<TD width="98%"><B>Log in</B>
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD align="right"><FONT size="-1">Username &nbsp; &nbsp; &nbsp;&nbsp;
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Password &nbsp; &nbsp; &nbsp;
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="right">
+			<FORM action="app" method="POST"><INPUT size="10" type="text"
+				name="uid" value="uid:0"> &nbsp; &nbsp; &nbsp; &nbsp; <INPUT
+				size="10" type="password" name="passwd" value="xxx"> &nbsp; <INPUT
+				type="submit" value="Log in"><INPUT type="hidden" name="action"
+				value="login"></FORM>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE width="616">
+	<TBODY>
+		<TR>
+			<TD width="2%"></TD>
+			<TD width="98%">
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD bgcolor="#e7e4e7" rowspan="4"></TD>
+			<TD><B><FONT size="-1" color="#000000">First time user? &nbsp;Please
+			Register</FONT></B></TD>
+		</TR>
+		<TR>
+			<TD></TD>
+		</TR>
+		<TR>
+			<TD align="right">
+			<BLOCKQUOTE><A href="register.jsp">Register&nbsp;With&nbsp;DayTrader</A>
+			</BLOCKQUOTE>
+			</TD>
+		</TR>
+		<TR>
+			<TD>
+			<HR>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE height="54" style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD colspan="2">
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD colspan="2"></TD>
+		</TR>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Login</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcome.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcomeImg.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcomeImg.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcomeImg.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<HTML>
+<HEAD>
+<TITLE>Trade Login</TITLE>
+<LINK rel="stylesheet" href="style.css" type="text/css" />
+</HEAD>
+<BODY bgcolor="#ffffff" link="#000099">
+<%@ page session="false"%>
+<TABLE style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Login</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE width="617" height="30">
+	<TBODY>
+		<TR>
+			<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);
+%></FONT></FONT></FONT></TD>
+			<TD align="right" width="365"></TD>
+			<TD align="center" width="99"><IMG src="images/graph.gif" width="27"
+				height="27" border="0" alt=""></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<DIV align="left"></DIV>
+<TABLE width="616">
+	<TBODY>
+		<TR>
+			<TD width="2%" bgcolor="#e7e4e7" rowspan="3"></TD>
+			<TD width="98%"><B>Log in</B>
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD align="right"><FONT size="-1">Username &nbsp; &nbsp; &nbsp;&nbsp;
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Password &nbsp; &nbsp; &nbsp;
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</FONT></TD>
+		</TR>
+		<TR>
+			<TD align="right">
+			<FORM action="app" method="POST"><INPUT size="10" type="text"
+				name="uid" value="uid:0"> &nbsp; &nbsp; &nbsp; &nbsp; <INPUT
+				size="10" type="password" name="passwd" value="xxx"> &nbsp; <INPUT
+				type="submit" value="Log in"><INPUT type="hidden" name="action"
+				value="login"></FORM>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE width="616">
+	<TBODY>
+		<TR>
+			<TD width="2%"></TD>
+			<TD width="98%">
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD bgcolor="#e7e4e7" rowspan="4"></TD>
+			<TD><B><FONT size="-1" color="#000000">First time user? &nbsp;Please
+			Register</FONT></B></TD>
+		</TR>
+		<TR>
+			<TD></TD>
+		</TR>
+		<TR>
+			<TD align="right">
+			<BLOCKQUOTE><A href="register.jsp">Register&nbsp;With&nbsp;DayTrader</A>
+			</BLOCKQUOTE>
+			</TD>
+		</TR>
+		<TR>
+			<TD>
+			<HR>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE height="54" style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD colspan="2" align="center"><BR>
+			<IMG src="images/ticker-anim.gif" width="385" height="22" border="0"
+				align="middle" alt=""></TD>
+		</TR>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Login</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcomeImg.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/pom.xml?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/pom.xml (added)
+++ geronimo/daytrader/trunk/assemblies/pom.xml Fri Aug 28 18:07:49 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>daytrader-parent</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.daytrader</groupId>
+    <artifactId>assemblies</artifactId>
+    <name>DayTrader :: Assemblies</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>daytrader-web-jdbc</module>
+<!--
+        <module>daytrader-web-jpa</module>
+        <module>daytrader-javaee</module>
+-->
+    </modules>
+
+</project>

Propchange: geronimo/daytrader/trunk/assemblies/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/daytrader/trunk/daytrader-webonly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-webonly/pom.xml?rev=808973&r1=808972&r2=808973&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-webonly/pom.xml (original)
+++ geronimo/daytrader/trunk/daytrader-webonly/pom.xml Fri Aug 28 18:07:49 2009
@@ -16,14 +16,12 @@
     limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>daytrader</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     

Modified: geronimo/daytrader/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/pom.xml?rev=808973&r1=808972&r2=808973&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/core/pom.xml Fri Aug 28 18:07:49 2009
@@ -16,30 +16,32 @@
     limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
+        <artifactId>modules</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
-    <artifactId>daytrader-ejb</artifactId>
-    <name>DayTrader :: EJBs</name>
-    <packaging>ejb</packaging>
-    <description>Daytrader EJBs</description>
+
+    <groupId>org.apache.geronimo.daytrader.modules</groupId>
+    <artifactId>core</artifactId>
+    <packaging>jar</packaging>
+    <name>DayTrader :: Modules - Core</name>
+    <description>Daytrader Core Module</description>
+
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb</connection>
-        <developerConnection>
-            scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ejb</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/core</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/core</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/core</url>
     </scm>
+
     <dependencies>
+<!--
         <dependency>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader-wsappclient</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -48,6 +50,17 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+    	    <groupId>org.apache.geronimo.specs</groupId>
+    	    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    	    <scope>provided</scope>
+	</dependency>
+-->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>    
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
             <scope>provided</scope>
@@ -63,11 +76,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-    	    <groupId>org.apache.geronimo.specs</groupId>
-    	    <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    	    <scope>provided</scope>
-	</dependency>
-        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <scope>provided</scope>
@@ -82,7 +90,7 @@
             <artifactId>openjpa</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- OpenJPA PCEnhancer ant task failed without these packages -->
+        <!-- OpenJPA PCEnhancer depends -->
         <dependency>
             <groupId>net.sourceforge.serp</groupId>
             <artifactId>serp</artifactId>
@@ -101,26 +109,7 @@
             <version>3.2.1</version>
             <scope>provided</scope>
         </dependency>
-        <!-- OpenJPA PCEnhancer anttask failed without these packages -->
-        <!--
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.6.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
-            <version>2.2.1</version>
-            <scope>provided</scope>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>    
+        <!-- end OpenJPA PCEnhancer depends -->
     </dependencies>
     <build>
         <resources>
@@ -132,6 +121,7 @@
 
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -140,7 +130,7 @@
                             <tasks>
                                 <path id="enhance.path.ref">
                                     <fileset dir="${project.build.outputDirectory}">
-                                        <include name="**/*.class"/>
+                                        <include name="*Bean*/*.class"/>
                                     </fileset>
                                 </path>
                                 <pathconvert property="enhance.files"
@@ -162,7 +152,9 @@
                     </execution>
                 </executions>
             </plugin>
+<!--
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ejb-plugin</artifactId>
                 <configuration>
                     <generateClient>true</generateClient>
@@ -173,6 +165,7 @@
                     </archive>
                 </configuration>
             </plugin>
+-->
         </plugins>
     </build>
 </project>