You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/02/17 09:24:04 UTC

svn commit: r1071543 [15/15] - in /geronimo/daytrader/trunk: ./ assemblies/javaee/ javaee6/ javaee6/assemblies/ javaee6/assemblies/daytrader-ear/ javaee6/assemblies/daytrader-ear/src/ javaee6/assemblies/daytrader-ear/src/main/ javaee6/assemblies/daytra...

Added: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/sample.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/sample.jsp?rev=1071543&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/sample.jsp (added)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/sample.jsp Thu Feb 17 08:23:57 2011
@@ -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>

Added: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/style.css
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/style.css?rev=1071543&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/style.css (added)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/style.css Thu Feb 17 08:23:57 2011
@@ -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

Added: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehome.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehome.jsp?rev=1071543&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehome.jsp (added)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehome.jsp Thu Feb 17 08:23:57 2011
@@ -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.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*"
+    session="true" isThreadSafe="true" isErrorPage="false"%>
+<jsp:useBean id="results" scope="request" type="java.lang.String" />
+<jsp:useBean id="accountData"
+    type="org.apache.geronimo.daytrader.javaee6.entities.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>

Added: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehomeImg.jsp?rev=1071543&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehomeImg.jsp (added)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehomeImg.jsp Thu Feb 17 08:23:57 2011
@@ -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.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*"
+    session="true" isThreadSafe="true" isErrorPage="false"%>
+<jsp:useBean id="results" scope="request" type="java.lang.String" />
+<jsp:useBean id="accountData"
+    type="org.apache.geronimo.daytrader.javaee6.entities.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>

Added: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/web_prmtv.html
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/web_prmtv.html?rev=1071543&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/web_prmtv.html (added)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/web_prmtv.html Thu Feb 17 08:23:57 2011
@@ -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>

Added: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/welcome.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/welcome.jsp?rev=1071543&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/welcome.jsp (added)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/welcome.jsp Thu Feb 17 08:23:57 2011
@@ -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>

Added: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/welcomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/welcomeImg.jsp?rev=1071543&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/welcomeImg.jsp (added)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/welcomeImg.jsp Thu Feb 17 08:23:57 2011
@@ -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>

Added: geronimo/daytrader/trunk/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/pom.xml?rev=1071543&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/pom.xml (added)
+++ geronimo/daytrader/trunk/javaee6/pom.xml Thu Feb 17 08:23:57 2011
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>daytrader-parent</artifactId>
+    <groupId>org.apache.geronimo.daytrader</groupId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>javaee6</artifactId>
+  <version>3.0-SNAPSHOT</version>
+  <name>Daytrader :: JAVA EE 6</name>
+  
+  <packaging>pom</packaging>  
+  
+  
+  <modules>
+    <module>modules</module>
+    <module>assemblies</module>
+  </modules>
+</project>
\ No newline at end of file

Modified: geronimo/daytrader/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/pom.xml?rev=1071543&r1=1071542&r2=1071543&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/pom.xml Thu Feb 17 08:23:57 2011
@@ -39,7 +39,7 @@
         <module>soap</module>
         <module>web</module>
         <module>streamer</module>
-        <module>json-proxy</module>
+        <!--<module>json-proxy</module>-->
     </modules>
 
 </project>

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=1071543&r1=1071542&r2=1071543&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Thu Feb 17 08:23:57 2011
@@ -14,8 +14,7 @@
     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">
+--><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>
 
@@ -138,7 +137,7 @@
 
     <dependencyManagement>
         <dependencies>
-        		<!-- Import Geronimo Server used dependency versions -->
+        <!-- Import Geronimo Server used dependency versions -->
             <dependency>
                 <groupId>org.apache.geronimo</groupId>
                 <artifactId>geronimo</artifactId>
@@ -193,6 +192,19 @@
                 <artifactId>serp</artifactId>
                 <version>1.13.1</version>
             </dependency>
+            
+            <!--JSF 1.2 JARs from Apache MyFaces -->
+            <dependency>
+                <groupId>org.apache.myfaces.core</groupId>
+                <artifactId>myfaces-api</artifactId>
+                <version>1.2.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.myfaces.core</groupId>
+                <artifactId>myfaces-impl</artifactId>
+                <version>1.2.3</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
@@ -201,81 +213,81 @@
             </dependency>
             
             <!-- All daytrader sub modules listed here -->
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>daytrader-util</artifactId>
-            		<version>${project.version}</version>
-            		<scope>provided</scope>
-        		</dependency>
-        		
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>daytrader-beans</artifactId>
-            		<version>${project.version}</version>
-            		<scope>provided</scope>            		
-        		</dependency>
-        		
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>daytrader-core</artifactId>
-            		<version>${project.version}</version>            		
-            		<scope>provided</scope>
-        		</dependency>
-        		
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>daytrader-ejb3</artifactId>
-            		<version>${project.version}</version>
-            		<type>ejb</type>         		
-            		<scope>provided</scope>
-        		</dependency>
-        		
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>daytrader-entities</artifactId>
-            		<version>${project.version}</version>      
-            		<scope>provided</scope>      		
-        		</dependency>
-        		
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>json-proxy</artifactId>
-            		<version>${project.version}</version>      
-            		<scope>provided</scope>      		
-        		</dependency>
-        		
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>daytrader-soap</artifactId>
-            		<version>${project.version}</version>   
-            		<scope>provided</scope>         		
-        		</dependency>
-        		
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>streamer</artifactId>
-            		<version>${project.version}</version>    
-            		<scope>provided</scope>        		
-        		</dependency>
-        		
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>daytrader-web</artifactId>
-            		<version>${project.version}</version>        
-            		<scope>provided</scope>    		
-        		</dependency>
-        		
-        		<dependency>
-        				<groupId>org.apache.geronimo.daytrader</groupId>
-            		<artifactId>wsappclient</artifactId>
-            		<version>${project.version}</version>       
-            		<scope>provided</scope>     		
-        		</dependency>
+        <dependency>
+       <groupId>org.apache.geronimo.daytrader</groupId>
+         <artifactId>daytrader-util</artifactId>
+           <version>${project.version}</version>
+            <scope>provided</scope>
+                </dependency>
+                
+                <dependency>
+                        <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>daytrader-beans</artifactId>
+                    <version>${project.version}</version>
+                    <scope>provided</scope>            
+                </dependency>
+                
+                <dependency>
+                        <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>daytrader-core</artifactId>
+                    <version>${project.version}</version>            
+                    <scope>provided</scope>
+                </dependency>
+                
+                <dependency>
+                        <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>daytrader-ejb3</artifactId>
+                    <version>${project.version}</version>
+                    <type>ejb</type>                 
+                    <scope>provided</scope>
+                </dependency>
+                
+                <dependency>
+                        <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>daytrader-entities</artifactId>
+                    <version>${project.version}</version>      
+                    <scope>provided</scope>              
+                </dependency>
+                
+                <dependency>
+                        <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>json-proxy</artifactId>
+                    <version>${project.version}</version>      
+                    <scope>provided</scope>              
+                </dependency>
+                
+                <dependency>
+                        <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>daytrader-soap</artifactId>
+                    <version>${project.version}</version>   
+                    <scope>provided</scope>                 
+                </dependency>
+                
+                <dependency>
+                        <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>streamer</artifactId>
+                    <version>${project.version}</version>    
+                    <scope>provided</scope>                
+                </dependency>
+                
+                <dependency>
+                        <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>daytrader-web</artifactId>
+                    <version>${project.version}</version>        
+                    <scope>provided</scope>            
+                </dependency>
+                
+                <dependency>
+                        <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>wsappclient</artifactId>
+                    <version>${project.version}</version>       
+                    <scope>provided</scope>             
+                </dependency>
                 
                 <dependency>
                 <groupId>org.apache.taglibs</groupId>
                 <artifactId>taglibs-standard-jstlel</artifactId>
-                <version>1.2</version>  
+                <version>1.2-SNAPSHOT</version>  
                 <scope>provided</scope>
         </dependency>
         </dependencies>        
@@ -345,7 +357,9 @@
                 <!-- Daytrader application -->
                 <module>modules</module>
                 <!-- Installable assemblies -->
-                <module>assemblies</module>                
+                <module>assemblies</module>  
+                <!-- Daytrader Java EE 6 -->
+               <module>javaee6</module>                
             </modules>
         </profile>             
 
@@ -374,29 +388,29 @@
                 <module>plugins/daytrader-oracle-datasource</module>
             </modules>
         </profile>
-	    <profile>
+        <profile>
             <id>mysql</id>
             <modules>
                 <module>plugins/daytrader-mysql-datasource</module>
             </modules>
         </profile>
-	    <profile>
+        <profile>
             <id>informix</id>
             <modules>
                 <module>plugins/daytrader-informix-datasource</module>
             </modules>
         </profile>
-	    <profile>
+        <profile>
             <id>sqlserver</id>
             <modules>
                 <module>plugins/daytrader-sqlserver-datasource</module>
             </modules>
-        </profile>	
-	    <profile>
+        </profile>    
+        <profile>
             <id>postgre</id>
             <modules>
                 <module>plugins/daytrader-postgre-datasource</module>
             </modules>
         </profile>
-    </profiles>
-</project>
+    </profiles> 
+</project>
\ No newline at end of file