geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1071965 - in /geronimo/daytrader/trunk/javaee6/modules: core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/ entities/src/main/resources/META-INF/ utils/src/main/java/org/apache/geronimo/daytrader/javaee6/utils/ web/src/ma...
Date Fri, 18 Feb 2011 11:21:20 GMT
Author: violalu
Date: Fri Feb 18 11:21:20 2011
New Revision: 1071965

URL: http://svn.apache.org/viewvc?rev=1071965&view=rev
Log:
DAYTRADER-91
Disable SOAP WebService  Access Mode and Web JDBC, Web JPA Run-time Mode.

Modified:
    geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java
    geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java
    geronimo/daytrader/trunk/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml
    geronimo/daytrader/trunk/javaee6/modules/utils/src/main/java/org/apache/geronimo/daytrader/javaee6/utils/TradeConfig.java
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/PingServlet2Jsp.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/account.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/accountImg.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/config.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/displayQuote.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/marketSummary.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/order.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/orderImg.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolioImg.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quoteImg.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/runStats.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehome.jsp
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehomeImg.jsp

Modified: geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java Fri Feb 18 11:21:20 2011
@@ -88,7 +88,7 @@ public class TradeAction implements Trad
                 Log.error("TradeAction:TradeAction() Creation of Trade EJB 3 failed\n" + e);
                 re = new RuntimeException(e);
             }
-        }/* else if (TradeConfig.runTimeMode == TradeConfig.SESSION3) {
+        } else if (TradeConfig.runTimeMode == TradeConfig.SESSION3) {
             try {
                 Class c = Class.forName("org.apache.geronimo.daytrader.javaee6.ejb3.DirectSLSBBean");
                 if ((trade == null) ||
@@ -133,7 +133,7 @@ public class TradeAction implements Trad
         } else {
             Log.error("TradeAction:TradeAction() Unknown Trade runtime mode.");
             re = new IllegalArgumentException("TradeAction:TradeAction() Unknown runTimeMode=" + TradeConfig.runTimeMode);
-        }*/
+        }
         
         if (re != null) {
             throw re;

Modified: geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java Fri Feb 18 11:21:20 2011
@@ -32,7 +32,7 @@ import org.apache.geronimo.daytrader.jav
 
 import org.apache.geronimo.daytrader.javaee6.utils.*;
 
-import java.rmi.RemoteException;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
@@ -63,9 +63,9 @@ import java.sql.Timestamp;
 
 public class TradeJEEDirect implements TradeServices, TradeDBServices {
 
-    //private static String dsName = TradeConfig.DATASOURCE;
+    private static String dsName = TradeConfig.DATASOURCE;
     
-    @Resource(name="jdbc/TradeDataSource")
+    /*@Resource(name="jdbc/TradeDataSource")*/
     private static DataSource datasource;
 
     
@@ -1834,10 +1834,10 @@ public class TradeJEEDirect implements T
 
     /*
      * Lookup the TradeData datasource
-     
+     */
     private void getDataSource() throws Exception {
         datasource = (DataSource) context.lookup(dsName);
-    }*/
+    }
 
     /*
      * Allocate a new connection to the datasource
@@ -1849,8 +1849,8 @@ public class TradeJEEDirect implements T
     private Connection getConn() throws Exception {
 
         Connection conn = null;
-        /*if (datasource == null)
-            getDataSource();*/
+       if (datasource == null)
+            getDataSource();
         conn = datasource.getConnection();
         conn.setAutoCommit(false);
         if (Log.doTrace()) {
@@ -2015,7 +2015,7 @@ public class TradeJEEDirect implements T
             return;
         if (Log.doTrace())
             Log.trace("TradeDirect:init -- *** initializing");
-        /*try {
+        try {
             if (Log.doTrace())
                 Log.trace("TradeDirect: init");
             context = new InitialContext();
@@ -2023,7 +2023,7 @@ public class TradeJEEDirect implements T
         } catch (Exception e) {
             Log.error("TradeDirect:init -- error on JNDI lookups of DataSource -- TradeDirect will not work", e);
             return;
-        }*/
+        }
 
         try {
             qConnFactory = (ConnectionFactory) context.lookup("java:comp/env/jms/QueueConnectionFactory");

Modified: geronimo/daytrader/trunk/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/entities/src/main/resources/META-INF/persistence.xml Fri Feb 18 11:21:20 2011
@@ -22,11 +22,11 @@
         <jta-data-source>jdbc/TradeDataSource</jta-data-source>  
         <non-jta-data-source>jdbc/NoTxTradeDataSource</non-jta-data-source> 
         
-        <class>org.apache.geronimo.daytrader.entities.AccountDataBean</class>
-        <class>org.apache.geronimo.daytrader.entities.AccountProfileDataBean</class>
-        <class>org.apache.geronimo.daytrader.entities.HoldingDataBean</class>
-        <class>org.apache.geronimo.daytrader.entities.OrderDataBean</class>
-        <class>org.apache.geronimo.daytrader.entities.QuoteDataBean</class>
+        <class>org.apache.geronimo.daytrader.javaee6.entities.AccountDataBean</class>
+        <class>org.apache.geronimo.daytrader.javaee6.entities.AccountProfileDataBean</class>
+        <class>org.apache.geronimo.daytrader.javaee6.entities.HoldingDataBean</class>
+        <class>org.apache.geronimo.daytrader.javaee6.entities.OrderDataBean</class>
+        <class>org.apache.geronimo.daytrader.javaee6.entities.QuoteDataBean</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         
         <properties>

Modified: geronimo/daytrader/trunk/javaee6/modules/utils/src/main/java/org/apache/geronimo/daytrader/javaee6/utils/TradeConfig.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/utils/src/main/java/org/apache/geronimo/daytrader/javaee6/utils/TradeConfig.java?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/utils/src/main/java/org/apache/geronimo/daytrader/javaee6/utils/TradeConfig.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/utils/src/main/java/org/apache/geronimo/daytrader/javaee6/utils/TradeConfig.java Fri Feb 18 11:21:20 2011
@@ -33,7 +33,8 @@ public class TradeConfig {
     public static final int UNKNOWN = -1;
 
     /* Trade Runtime Mode parameters */
-    public static String[] runTimeModeNames = {"Full EJB3", "Direct (JDBC)", "Session (EJB3) To Direct", "Web JDBC", "Web JPA"};
+   //Disable Web JDBC&JPA public static String[] runTimeModeNames = {"Full EJB3", "Direct (JDBC)", "Session (EJB3) To Direct", "Web JDBC", "Web JPA"};    
+    public static String[] runTimeModeNames = {"Full EJB3", "Direct (JDBC)", "Session (EJB3) To Direct"};
     public static final int EJB3 = 0;
     public static final int DIRECT = 1;
     public static final int SESSION3 = 2;
@@ -53,7 +54,8 @@ public class TradeConfig {
     public static final int ASYNCH_2PHASE = 1;
     public static int orderProcessingMode = SYNCH;
 
-    public static String[] accessModeNames = { "Standard", "WebServices" };
+    //public static String[] accessModeNames = { "Standard", "WebServices" };
+    public static String[] accessModeNames = { "Standard" };
     public static final int STANDARD = 0;
     public static final int WEBSERVICES = 1;
     private static int accessMode = STANDARD;

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java Fri Feb 18 11:21:20 2011
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 
 import org.apache.geronimo.daytrader.javaee6.core.api.*;
 import org.apache.geronimo.daytrader.javaee6.core.direct.*;
-import org.apache.geronimo.daytrader.javaee6.core.beans.*;
+
 import org.apache.geronimo.daytrader.javaee6.entities.AccountDataBean;
 import org.apache.geronimo.daytrader.javaee6.entities.AccountProfileDataBean;
 import org.apache.geronimo.daytrader.javaee6.entities.OrderDataBean;

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/PingServlet2Jsp.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/PingServlet2Jsp.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/PingServlet2Jsp.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/PingServlet2Jsp.jsp Fri Feb 18 11:21:20 2011
@@ -25,7 +25,7 @@
 <BODY>
 <%! String initTime = (new java.util.Date()).toString(); 
  %>
-<jsp:useBean id="ab" type="org.apache.geronimo.samples.daytrader.web.prims.PingBean" scope="request" />
+<jsp:useBean id="ab" type="org.apache.geronimo.daytrader.javaee6.web.prims.PingBean" scope="request" />
 <HR>
 <FONT size="+2" color="#000066"><BR>
 Ping Servlet2JSP:<BR>

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml Fri Feb 18 11:21:20 2011
@@ -69,7 +69,7 @@
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
-<!-- JavaEE only
+
     <resource-ref>
         <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
         <res-type>javax.jms.QueueConnectionFactory</res-type>
@@ -83,7 +83,7 @@
         <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
     
-    <ejb-ref>
+    <!--  <ejb-ref>
         <ejb-ref-name>ejb/TradeSLSBBean</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
         <remote>org.apache.geronimo.samples.daytrader.ejb3.TradeSLSBRemote</remote>
@@ -94,7 +94,7 @@
         <ejb-ref-type>Session</ejb-ref-type>
         <remote>org.apache.geronimo.samples.daytrader.ejb3.DirectSLSBRemote</remote>
         <ejb-link>DirectSLSBBean</ejb-link>
-    </ejb-ref>
+    </ejb-ref>-->
 
     <message-destination-ref>
         <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
@@ -109,7 +109,7 @@
         <message-destination-link>dt-ejb.jar#jms/TradeStreamerTopic</message-destination-link>
     </message-destination-ref>
     
-    <service-ref>
+    <!--  <service-ref>
         <description>WSDL Service Trade</description>
         <service-ref-name>service/Trade</service-ref-name>
         <service-interface>org.apache.geronimo.samples.daytrader.client.ws.Trade</service-interface>
@@ -119,6 +119,6 @@
         <port-component-ref>
             <service-endpoint-interface>org.apache.geronimo.samples.daytrader.client.ws.TradeWSServices</service-endpoint-interface>
         </port-component-ref>
-    </service-ref>
--->
+    </service-ref>-->
+
 </web-app>

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/account.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/account.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/account.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/account.jsp Fri Feb 18 11:21:20 2011
@@ -23,7 +23,7 @@
 </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.*"
+    import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.daytrader.javaee6.core.direct.*,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"

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/accountImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/accountImg.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/accountImg.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/accountImg.jsp Fri Feb 18 11:21:20 2011
@@ -23,7 +23,7 @@
 </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.*"
+    import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.daytrader.javaee6.core.direct.*, 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"

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/config.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/config.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/config.jsp Fri Feb 18 11:21:20 2011
@@ -9,280 +9,308 @@
       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,
+  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 XHTML 1.0 Transitional//EN" 
-  "http://www.w3.org/tr/xhtml1/Dtd/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" 
-           xmlns:f="http://java.sun.com/jsf/core" 
-           xmlns:h=http://java.sun.com/jsf/html
-            xmlns:ui="http://java.sun.com/jsf/facelets">
-            
-<h:head>Welcome to DayTrader</h:head>          
-<h:body bgcolor="#ffffff" link="#000099">
+<!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>
+</HEAD>
+<BODY bgcolor="#ffffff" link="#000099">
 <%@ page import="org.apache.geronimo.daytrader.javaee6.utils.TradeConfig"
-session="false" isThreadSafe="true" isErrorPage="false"%>
+	session="false" isThreadSafe="true" isErrorPage="false"%>
 
-<table style="font-size: smaller">
-<tbody>
-<tr>
-<td bgcolor="#c93333" align="left" width="640" height="10"><b><FONT
-color="#ffffff">DayTrader Configuration</FONT></b></td>
-<td align="center" bgcolor="#000000" width="100" height="10"><FONT
-color="#ffffff"><b>DayTrader</b></FONT></td>
-</tr>
-<tr>
-<td colspan="6">
-<hr>
-</td>
-</tr>
-<tr>
-<td colspan="6"></td>
-</tr>
-</tbody>
-</table>
+<TABLE style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Configuration</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+		<TR>
+			<TD colspan="6">
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD colspan="6"></TD>
+		</TR>
+	</TBODY>
+</TABLE>
 
 <%
 String status;
 status = (String) request.getAttribute("status");
 if (status != null) {
 %>
-<table width="740" height="30">
-<tbody>
-<tr>
-<td></td>
-<td><FONT color="#ff0033"><% out.print(status); %> </FONT></td>
-<td></td>
-</tr>
-</tbody>
-</table>
+<TABLE width="740" height="30">
+	<TBODY>
+		<TR>
+			<TD></TD>
+			<TD><FONT color="#ff0033"><% out.print(status); %> </FONT></TD>
+			<TD></TD>
+		</TR>
+	</TBODY>
+</TABLE>
 <%
 }
 %>
 
-<h:form action="config" method="POST">
-<h:inputHidden id="name" value="updateConfig"></h:inputHidden>
-<!--<INPUT type="hidden" name="action"
-value="updateConfig">-->
+<FORM action="config" method="POST"><INPUT type="hidden" name="action"
+	value="updateConfig">
 
-<table border="1" width="740">
-<tbody>
-<tr>
-<td colspan="2">The current DayTrader runtime configuration is
-detailed below. View and optionally update run-time parameters.
-&nbsp;<br>
-<br>
-<b>NOTE: </b>Parameters settings will return to default
-on&nbsp;server restart. To make configuration settings persistent
-across application server stop/starts, edit the servlet init
-parameters for each DayTrader servlet. This is described in the <A
-href="docs/tradeFAQ.html">DayTrader FAQ</A>.<br>
-<hr>
-</td>
-</tr>
-<tr>
-<td align="left"><b>Run-Time Mode </b>
-<P align="left"><%String configParm = "RunTimeMode";
+<TABLE border="1" width="740">
+	<TBODY>
+		<TR>
+			<TD colspan="2">The current DayTrader runtime configuration is
+			detailed below. View and optionally update run-time parameters.
+			&nbsp;<BR>
+			<BR>
+			<B>NOTE: </B>Parameters settings will return to default
+			on&nbsp;server restart. To make configuration settings persistent
+			across application server stop/starts, edit the servlet init
+			parameters for each DayTrader servlet. This is described in the <A
+				href="docs/tradeFAQ.html">DayTrader FAQ</A>.<BR>
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD align="left"><B>Run-Time Mode </B>
+			<P align="left"><%String configParm = "RunTimeMode";
 String names[] = TradeConfig.runTimeModeNames;
 int index = TradeConfig.runTimeMode;
 for (int i = 0; i < names.length; i++) {
-out.print(
-"<INPUT type=\"radio\" name=\""
-+ configParm
-+ "\" value=\""
-+ i
-+ "\" ");
-if (index == i)
-out.print("checked");
-out.print("> " + names[i] + "<br>");
+	out.print(
+		"<INPUT type=\"radio\" name=\""
+			+ configParm
+			+ "\" value=\""
+			+ i
+			+ "\" ");
+	if (index == i)
+		out.print("checked");
+	out.print("> " + names[i] + "<BR>");
 }
 %></P>
-</td>
-<td><br>
-Run Time Mode determines server implementation of the TradeServices
-to use in the DayTrader application Enterprise Java beans including
-Session, Entity and Message beans or Direct mode which uses direct
-database and JMS access. See <A href="docs/tradeFAQ.html">DayTrader
-FAQ</A> for details.<br>
-</td>
-</tr>
+			</TD>
+			<TD><BR>
+			Run Time Mode determines server implementation of the TradeServices
+			to use in the DayTrader application Enterprise Java Beans including
+			Session, Entity and Message beans or Direct mode which uses direct
+			database and JMS access. See <A href="docs/tradeFAQ.html">DayTrader
+			FAQ</A> for details.<BR>
+			</TD>
+		</TR>
+		
+		
+		<TR>
+			<TD align="left"><B>JPA Layer</B>
+			<P align="left"><%configParm = "JPALayer";
+names = TradeConfig.jpaLayerNames;
+index = TradeConfig.jpaLayer;
+for (int i = 0; i < names.length; i++) {
+	out.print(
+		"<INPUT type=\"radio\" name=\""
+			+ configParm
+			+ "\" value=\""
+			+ i
+			+ "\" ");
+	if (index == i)
+		out.print("checked");
+	out.print("> " + names[i] + "<BR>");
+}
+%></P>
+			</TD>
+			<TD><BR>
+			JPA Layer determines what kind of JPA Implementation Daytrader 
+			EJB classes use. Typically, Apache Geronimo uses OpenJPA, and RedHat
+			JBoss 5 uses Hibernate.<BR>
+			</TD>
+		</TR>
 
-<tr>
-<td align="left"><b>Scenario Workload Mix</b>
-<P align="left"><%configParm = "WorkloadMix";
+
+		<TR>
+			<TD align="left"><B>Order-Processing Mode </B>
+			<P align="left"><%configParm = "OrderProcessingMode";
+names = TradeConfig.orderProcessingModeNames;
+index = TradeConfig.orderProcessingMode;
+for (int i = 0; i < names.length; i++) {
+	out.print(
+		"<INPUT type=\"radio\" name=\""
+			+ configParm
+			+ "\" value=\""
+			+ i
+			+ "\" ");
+	if (index == i)
+		out.print("checked");
+	out.print("> " + names[i] + "<BR>");
+}
+%></P>
+			</TD>
+			<TD><BR>
+			Order Processing Mode determines the mode for completing stock
+			purchase and sell operations. Synchronous mode completes the order
+			immediately. Asychronous_2-Phase performs a 2-phase commit over the EJB Entity/DB
+ 			and MDB/JMS transactions. See <A href="docs/tradeFAQ.html">DayTrader
+ 			FAQ</A> for details. <B></B><BR>
+ 			</TD>
+		</TR>
+		
+		<TR>
+			<TD align="left"><B>Scenario Workload Mix</B>
+			<P align="left"><%configParm = "WorkloadMix";
 names = TradeConfig.workloadMixNames;
 index = TradeConfig.workloadMix;
 for (int i = 0; i < names.length; i++) {
-out.print(
-"<INPUT type=\"radio\" name=\""
-+ configParm
-+ "\" value=\""
-+ i
-+ "\" ");
-if (index == i)
-out.print("checked");
-out.print("> " + names[i] + "<br>");
+	out.print(
+		"<INPUT type=\"radio\" name=\""
+			+ configParm
+			+ "\" value=\""
+			+ i
+			+ "\" ");
+	if (index == i)
+		out.print("checked");
+	out.print("> " + names[i] + "<BR>");
 }
 %></P>
-</td>
-<td>This setting determines the runtime workload mix of DayTrader
-operations when driving the benchmark through TradeScenarioServlet.
-See <a href="docs/tradeFAQ.html">DayTrader FAQ</a> for details.</td>
-</tr>
-<tr>
-<td align="left"><b>WebInterface</b>
-<P align="left"><%configParm = "WebInterface";
+			</TD>
+			<TD>This setting determines the runtime workload mix of DayTrader
+			operations when driving the benchmark through TradeScenarioServlet.
+			See <A href="docs/tradeFAQ.html">DayTrader FAQ</A> for details.</TD>
+		</TR>
+		<TR>
+			<TD align="left"><B>WebInterface</B>
+			<P align="left"><%configParm = "WebInterface";
 names = TradeConfig.webInterfaceNames;
 index = TradeConfig.webInterface;
 for (int i = 0; i < names.length; i++) {
-out.print(
-"<INPUT type=\"radio\" name=\""
-+ configParm
-+ "\" value=\""
-+ i
-+ "\" ");
-if (index == i)
-out.print("checked");
-out.print("> " + names[i] + "<br>");
+	out.print(
+		"<INPUT type=\"radio\" name=\""
+			+ configParm
+			+ "\" value=\""
+			+ i
+			+ "\" ");
+	if (index == i)
+		out.print("checked");
+	out.print("> " + names[i] + "<BR>");
 }
 %></P>
-</td>
-<td>This setting determines the Web interface technology used, JSPs
-or JSPs with static images and GIFs.</td>
-</tr>
-<!--<tr>
-<td align="left">
-<b>Caching Type</b>
-<P align="left"><%configParm = "CachingType";
+			</TD>
+			<TD>This setting determines the Web interface technology used, JSPs
+			or JSPs with static images and GIFs.</TD>
+		</TR>
+		<!--		<TR>
+			<TD align="left">
+			<B>Caching Type</B>
+			<P align="left"><%configParm = "CachingType";
 names = TradeConfig.cachingTypeNames;
 index = TradeConfig.cachingType;
 for (int i = 0; i < names.length; i++) {
-out.print(
-"<INPUT type=\"radio\" name=\""
-+ configParm
-+ "\" value=\""
-+ i
-+ "\" ");
-if (index == i)
-out.print("checked");
-out.print("> " + names[i] + "<br>");
+	out.print(
+		"<INPUT type=\"radio\" name=\""
+			+ configParm
+			+ "\" value=\""
+			+ i
+			+ "\" ");
+	if (index == i)
+		out.print("checked");
+	out.print("> " + names[i] + "<BR>");
 }
 %></P>
-</td>
-<td>
-This setting determines the caching technology used for data caching
-, DistributedMap, Command Caching or No Caching.
-</td>
-</tr>-->
-<tr>
-<td colspan="2" align="center"><b>Miscellaneous Settings</b></td>
-</tr>
-<tr>
-<td align="left"><b>DayTrader Max Users </b><br>
-<h:inputText size="25" label="MaxUsers" value="#{TradeConfig.getMAX_USERS}">
-<!--<INPUT size="25" type="text" name="MaxUsers"
-value="<%=TradeConfig.getMAX_USERS()%>">-->
-<br>
-<b>Trade Max Quotes</b><br>
-<h:inputText size="25" label="MaxQuotes" value="#{TradeConfig.getMAX_QUOTES}">
-<!--<INPUT size="25" type="text" name="MaxQuotes"
-value="<%=TradeConfig.getMAX_QUOTES()%>">-->
-</td>
-<td>by default the DayTrader database is populated with 200 users
-(uid:0 - uid:199) and 400 quotes (s:0 - s:399). <br>
-</td>
-</tr>
-<tr>
-<td align="left"><b>Market Summary Interval</b><br>
-<h:inputText size="25" label="MaxQuotes" value="#{TradeConfig.getMarketSummaryInterval}">
-<!--<INPUT size="25" type="text" name="marketSummaryInterval"
-value="<%=TradeConfig.getMarketSummaryInterval()%>">-->
-</td>
-<td>&lt; 0 Do not perform Market Summary Operations.
-<br>= 0 Perform market Summary on every request.</br>
-<br>&gt; 0 number of seconds between Market Summary Operations</br></td>
-</tr>
-<tr>
-<td align="left"><b>Primitive Iteration</b><br>
-<h:inputText size="25" label="MaxQuotes" value="#{TradeConfig.getPrimIterations}">
-<!--<INPUT size="25" type="text" name="primIterations"
-value="<%=TradeConfig.getPrimIterations()%>">-->
-
-</td>
-<td>by default the DayTrader primitives are execute one operation per
-web request. Change this value to repeat operations multiple times
-per web request.</td>
-</tr>
-
-<tr>
-<h:inputHidden lable="EnablePublishQuotePriceChange" value=""></h:inputHidden>
-<!--<INPUT type="hidden" name="EnablePublishQuotePriceChange" value=""/>-->
-</tr>
-
-<tr>
-<td align="left">
-<!--<h:selectBooleanCheckbox id="EnableLongRun" rendered="true" binding="#{TradeConfig.getLongRun}" />
-<h:outputLabel
-    for="EnableLongRun"
-    rendered="true"
-    binding="#{TradeConfig.getLongRunText}">
-     <h:outputText
-        id="EnableLongRunText"
-        value="#{TradeConfig.getLongRun}" />
-</h:outputLabel>-->
-<INPUT type="checkbox"
+			</TD>
+			<TD>
+			This setting determines the caching technology used for data caching
+			, DistributedMap, Command Caching or No Caching.
+			</TD>
+		</TR>-->
+		<TR>
+			<TD colspan="2" align="center"><B>Miscellaneous Settings</B></TD>
+		</TR>
+		<TR>
+			<TD align="left"><B>DayTrader Max Users </B><BR>
+			<INPUT size="25" type="text" name="MaxUsers"
+				value="<%=TradeConfig.getMAX_USERS()%>"><BR>
+			<B>Trade Max Quotes</B><BR>
+			<INPUT size="25" type="text" name="MaxQuotes"
+				value="<%=TradeConfig.getMAX_QUOTES()%>"></TD>
+			<TD>By default the DayTrader database is populated with 200 users
+			(uid:0 - uid:199) and 400 quotes (s:0 - s:399). <BR>
+			</TD>
+		</TR>
+		<TR>
+			<TD align="left"><B>Market Summary Interval</B><BR>
+			<INPUT size="25" type="text" name="marketSummaryInterval"
+				value="<%=TradeConfig.getMarketSummaryInterval()%>"></TD>
+			<TD>&lt; 0 Do not perform Market Summary Operations.
+			<br>= 0 Perform market Summary on every request.</br>
+			<br>&gt; 0 number of seconds between Market Summary Operations</br></TD>
+		</TR>
+		<TR>
+			<TD align="left"><B>Primitive Iteration</B><BR>
+			<INPUT size="25" type="text" name="primIterations"
+				value="<%=TradeConfig.getPrimIterations()%>"></TD>
+			<TD>By default the DayTrader primitives are execute one operation per
+			web request. Change this value to repeat operations multiple times
+			per web request.</TD>
+		</TR>
+		<TR>
+			<TD align="left"><INPUT type="checkbox"
+                <%=TradeConfig.getPublishQuotePriceChange() ? "checked" : ""%>
+                name="EnablePublishQuotePriceChange"> <B><FONT size="-1">Publish Quote Updates</FONT></B><BR>
+            </TD>
+            <TD>
+                Publish quote price changes to a JMS topic.<BR>
+            </TD>
+        </TR>
+		<TR>
+			<TD align="left"><INPUT type="checkbox"
                 <%=TradeConfig.getLongRun() ? "checked" : ""%>
-                name="EnableLongRun">
-<b><FONT size="-1">Enable long run support</FONT></b><br>
-            </td>
-            <td>
-                Enable long run support by disabling the show all orders query performed on the Account page.<br>
-            </td>
-        </tr>
-        <tr>
-            <td align="left">
+                name="EnableLongRun"> <B><FONT size="-1">Enable long run support</FONT></B><BR>
+            </TD>
+            <TD>
+                Enable long run support by disabling the show all orders query performed on the Account page.<BR>
+            </TD>
+        </TR>
+        <TR>
+            <TD align="left">
             <INPUT type="checkbox"
-<%=TradeConfig.getActionTrace() ? "checked" : ""%>
-name="EnableActionTrace"> <b><FONT size="-1">Enable operation trace</FONT></b><br>
-<INPUT type="checkbox" <%=TradeConfig.getTrace() ? "checked" : ""%>
-name="EnableTrace"> <b><FONT size="-1">Enable full trace</FONT></b>
-</td>
-<td>Enable DayTrader processing trace messages<br>
-</td>
-</tr>
-<tr>
-<td colspan="2" align="right">
-<!--<INPUT type="submit"
-value="Update Config">-->
-<h:commandButton value="Submit"
-     action="Update Config"/>
-<h:
-</td>
-</tr>
-</tbody>
-</table>
+				<%=TradeConfig.getActionTrace() ? "checked" : ""%>
+				name="EnableActionTrace"> <B><FONT size="-1">Enable operation trace</FONT></B><BR>
+			<INPUT type="checkbox" <%=TradeConfig.getTrace() ? "checked" : ""%>
+				name="EnableTrace"> <B><FONT size="-1">Enable full trace</FONT></B>
+			</TD>
+			<TD>Enable DayTrader processing trace messages<BR>
+			</TD>
+		</TR>
+		<TR>
+			<TD colspan="2" align="right"><INPUT type="submit"
+				value="Update Config"></TD>
+		</TR>
+	</TBODY>
+</TABLE>
 
-<table width="740" 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 Configuration</FONT></b></td>
-<td align="center" bgcolor="#000000" width="100" height="10"><FONT
-color="#ffffff"><b>DayTrader</b></FONT></td>
-</tr>
-</tbody>
-</table>
-</h:form>
-</h:body>
-</html>
+<TABLE width="740" 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 Configuration</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</FORM>
+</BODY>
+</HTML>

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/displayQuote.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/displayQuote.jsp Fri Feb 18 11:21:20 2011
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ page
-    import="java.math.BigDecimal, org.apache.geronimo.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*"
+    import="java.math.BigDecimal, org.apache.geronimo.daytrader.javaee6.core.direct.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*,org.apache.geronimo.daytrader.javaee6.core.api.*"
     session="true" isThreadSafe="true" isErrorPage="false"%>
 <% 
     String symbol = request.getParameter("symbol");

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/marketSummary.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/marketSummary.jsp Fri Feb 18 11:21:20 2011
@@ -17,7 +17,7 @@
 
 
 <%@ page
-    import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*"
+    import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.direct.*, org.apache.geronimo.daytrader.javaee6.core.api.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.core.beans.*"
     session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <%

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/order.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/order.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/order.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/order.jsp Fri Feb 18 11:21:20 2011
@@ -22,7 +22,7 @@
 
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.direct.*, 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" />
 
 <TABLE height="54">

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/orderImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/orderImg.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/orderImg.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/orderImg.jsp Fri Feb 18 11:21:20 2011
@@ -22,7 +22,7 @@
 
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.direct.*, 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" />
 
 <TABLE height="54">

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.jsp Fri Feb 18 11:21:20 2011
@@ -22,7 +22,7 @@
 <LINK rel="stylesheet" href="style.css" type="text/css" />
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.daytrader.javaee6.core.direct.*, 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="holdingDataBeans" type="java.util.Collection" scope="request" />
 <jsp:useBean id="quoteDataBeans" type="java.util.Collection" scope="request"/>

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolioImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolioImg.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolioImg.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolioImg.jsp Fri Feb 18 11:21:20 2011
@@ -23,7 +23,7 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-    import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*"
+    import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.daytrader.javaee6.core.direct.*, 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="holdingDataBeans" type="java.util.Collection"

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.jsp Fri Feb 18 11:21:20 2011
@@ -23,7 +23,7 @@
 </HEAD>
 
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.direct.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*" session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <TABLE height="54">
   <TBODY>

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quoteImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quoteImg.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quoteImg.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quoteImg.jsp Fri Feb 18 11:21:20 2011
@@ -24,7 +24,7 @@
 
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-    import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*"
+    import="java.util.Collection, java.util.Iterator, org.apache.geronimo.daytrader.javaee6.core.direct.*, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.utils.*"
     session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <TABLE height="54">

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/runStats.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/runStats.jsp?rev=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/runStats.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/runStats.jsp Fri Feb 18 11:21:20 2011
@@ -25,7 +25,7 @@
     session="false" isThreadSafe="true" isErrorPage="false"%>
 
 <jsp:useBean
-    class="org.apache.geronimo.daytrader.javaee6.core.RunStatsDataBean"
+    class="org.apache.geronimo.daytrader.javaee6.core.beans.RunStatsDataBean"
     id="runStatsData" scope="request" />
 <% 
 double loginPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.LOGOUT_OP]) / 100.0;

Modified: 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=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehome.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehome.jsp Fri Feb 18 11:21:20 2011
@@ -23,7 +23,7 @@
 </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.*"
+    import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.daytrader.javaee6.entities.*, org.apache.geronimo.daytrader.javaee6.core.direct.*"
     session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="accountData"

Modified: 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=1071965&r1=1071964&r2=1071965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehomeImg.jsp (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/tradehomeImg.jsp Fri Feb 18 11:21:20 2011
@@ -23,7 +23,7 @@
 </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.*"
+    import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.daytrader.javaee6.core.direct.*, 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"



Mime
View raw message