You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2010/01/13 18:51:09 UTC
svn commit: r898859 [2/2] - in
/geronimo/sandbox/jbohn/daytrader-bp-new/modules: daytrader-api/
daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/
daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/persistence/
daytra...
Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBeanImpl.java (from r898362, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBeanImpl.java?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBeanImpl.java&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java&r1=898362&r2=898859&rev=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBeanImpl.java Wed Jan 13 17:51:05 2010
@@ -39,6 +39,10 @@
import org.apache.geronimo.samples.daytrader.util.Log;
import org.apache.geronimo.samples.daytrader.util.TradeConfig;
+import org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.OrderDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.QuoteDataBean;
@Entity(name = "orderejb")
@Table(name = "orderejb")
@@ -58,7 +62,7 @@
@NamedQuery(name = "orderejb.completeClosedOrders", query = "UPDATE orderejb o SET o.orderStatus = 'completed' WHERE o.orderStatus = 'closed' AND o.account.profile.userID = :userID")
})
-public class OrderDataBean implements Serializable {
+public class OrderDataBeanImpl implements OrderDataBean, Serializable {
@TableGenerator(name = "orderIdGen", table = "KEYGENEJB", pkColumnName = "KEYNAME", valueColumnName = "KEYVAL", pkColumnValue = "order", allocationSize = 1000)
@Id
@@ -107,10 +111,10 @@
@Transient
private String symbol;
- public OrderDataBean() {
+ public OrderDataBeanImpl() {
}
- public OrderDataBean(Integer orderID, String orderType, String orderStatus,
+ public OrderDataBeanImpl(Integer orderID, String orderType, String orderStatus,
Date openDate, Date completionDate, double quantity,
BigDecimal price, BigDecimal orderFee, String symbol) {
setOrderID(orderID);
@@ -124,7 +128,7 @@
setSymbol(symbol);
}
- public OrderDataBean(String orderType, String orderStatus, Date openDate,
+ public OrderDataBeanImpl(String orderType, String orderStatus, Date openDate,
Date completionDate, double quantity, BigDecimal price,
BigDecimal orderFee, AccountDataBean account, QuoteDataBean quote,
HoldingDataBean holding) {
@@ -141,7 +145,7 @@
}
public static OrderDataBean getRandomInstance() {
- return new OrderDataBean(new Integer(TradeConfig.rndInt(100000)),
+ return new OrderDataBeanImpl(new Integer(TradeConfig.rndInt(100000)),
TradeConfig.rndBoolean() ? "buy" : "sell", "open",
new java.util.Date(TradeConfig.rndInt(Integer.MAX_VALUE)),
new java.util.Date(TradeConfig.rndInt(Integer.MAX_VALUE)),
@@ -328,10 +332,10 @@
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
- if (!(object instanceof OrderDataBean)) {
+ if (!(object instanceof OrderDataBeanImpl)) {
return false;
}
- OrderDataBean other = (OrderDataBean) object;
+ OrderDataBeanImpl other = (OrderDataBeanImpl) object;
if (this.orderID != other.orderID
&& (this.orderID == null || !this.orderID.equals(other.orderID)))
return false;
Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBeanImpl.java (from r898362, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBeanImpl.java?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBeanImpl.java&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java&r1=898362&r2=898859&rev=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBeanImpl.java Wed Jan 13 17:51:05 2010
@@ -30,6 +30,7 @@
import org.apache.geronimo.samples.daytrader.util.Log;
import org.apache.geronimo.samples.daytrader.util.TradeConfig;
+import org.apache.geronimo.samples.daytrader.persistence.api.QuoteDataBean;
@Entity(name = "quoteejb")
@Table(name = "quoteejb")
@@ -46,10 +47,10 @@
@NamedQuery(name = "quoteejb.findByChange1", query = "SELECT q FROM quoteejb q WHERE q.change1 = :change1")
})
@NamedNativeQueries({
- @NamedNativeQuery(name="quoteejb.quoteForUpdate", query="select * from quoteejb q where q.symbol=? for update",resultClass=org.apache.geronimo.samples.daytrader.beans.QuoteDataBean.class)
+ @NamedNativeQuery(name="quoteejb.quoteForUpdate", query="select * from quoteejb q where q.symbol=? for update",resultClassorg.apache.geronimo.samples.daytrader.beans.QuoteDataBeanImpl.class)
})
-public class QuoteDataBean implements Serializable {
+public class QuoteDataBeanImpl implements QuoteDataBean, Serializable {
/**
*
@@ -83,10 +84,10 @@
- public QuoteDataBean() {
+ public QuoteDataBeanImpl() {
}
- public QuoteDataBean(String symbol, String companyName, double volume,
+ public QuoteDataBeanImpl(String symbol, String companyName, double volume,
BigDecimal price, BigDecimal open, BigDecimal low,
BigDecimal high, double change) {
setSymbol(symbol);
@@ -100,7 +101,7 @@
}
public static QuoteDataBean getRandomInstance() {
- return new QuoteDataBean(
+ return new QuoteDataBeanImpl(
TradeConfig.rndSymbol(), //symbol
TradeConfig.rndSymbol() + " Incorporated", //Company Name
TradeConfig.rndFloat(100000), //volume
@@ -112,8 +113,8 @@
);
}
- //Create a "zero" value quoteDataBean for the given symbol
- public QuoteDataBean(String symbol) {
+ //Create a "zero" value QuoteDataBeanImpl for the given symbol
+ public QuoteDataBeanImpl(String symbol) {
setSymbol(symbol);
}
@@ -219,10 +220,10 @@
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set
- if (!(object instanceof QuoteDataBean)) {
+ if (!(object instanceof QuoteDataBeanImpl)) {
return false;
}
- QuoteDataBean other = (QuoteDataBean)object;
+ QuoteDataBeanImpl other = (QuoteDataBeanImpl)object;
if (this.symbol != other.symbol && (this.symbol == null || !this.symbol.equals(other.symbol))) return false;
return true;
}
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml Wed Jan 13 17:51:05 2010
@@ -22,11 +22,11 @@
<jta-data-source>javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/TradeDataSource)</jta-data-source>
<non-jta-data-source>javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/NoTxTradeDataSource)</non-jta-data-source>
- <class>org.apache.geronimo.samples.daytrader.beans.AccountDataBean</class>
- <class>org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean</class>
- <class>org.apache.geronimo.samples.daytrader.beans.HoldingDataBean</class>
- <class>org.apache.geronimo.samples.daytrader.beans.OrderDataBean</class>
- <class>org.apache.geronimo.samples.daytrader.beans.QuoteDataBean</class>
+ <class>org.apache.geronimo.samples.daytrader.beans.AccountDataBeanImpl</class>
+ <class>org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBeanImpl</class>
+ <class>org.apache.geronimo.samples.daytrader.beans.HoldingDataBeanImpl</class>
+ <class>org.apache.geronimo.samples.daytrader.beans.OrderDataBeanImpl</class>
+ <class>org.apache.geronimo.samples.daytrader.beans.QuoteDataBeanImpl</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml Wed Jan 13 17:51:05 2010
@@ -45,15 +45,17 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-entities</artifactId>
+ <artifactId>daytrader-beans</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+-->
</dependencies>
<build>
@@ -75,9 +77,10 @@
<!--org.apache.geronimo.samples.daytrader.persist.jdbc;version=1.0.0-->
</Export-Package>
<Import-Package>
+ org.apache.geronimo.samples.daytrader.api;version=1.0,
org.apache.geronimo.samples.daytrader.beans;version=1.0,
+ org.apache.geronimo.samples.daytrader.persistence.api;version=1.0,
org.apache.geronimo.samples.daytrader.util;version=1.0,
- org.apache.geronimo.samples.daytrader.api;version=1.0,
javax.naming,
javax.sql
</Import-Package>
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java Wed Jan 13 17:51:05 2010
@@ -23,13 +23,18 @@
import javax.sql.DataSource;
-import org.apache.geronimo.samples.daytrader.beans.AccountDataBean;
-import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean;
-import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
-import org.apache.geronimo.samples.daytrader.beans.MarketSummaryDataBean;
-import org.apache.geronimo.samples.daytrader.beans.OrderDataBean;
-import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
import org.apache.geronimo.samples.daytrader.api.TradeServices;
+import org.apache.geronimo.samples.daytrader.beans.AccountDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.beans.HoldingDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.beans.OrderDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.beans.QuoteDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.AccountProfileDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.MarketSummaryDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.OrderDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.QuoteDataBean;
import org.apache.geronimo.samples.daytrader.util.FinancialUtils;
import org.apache.geronimo.samples.daytrader.util.Log;
import org.apache.geronimo.samples.daytrader.util.TradeConfig;
@@ -105,10 +110,6 @@
MarketSummaryDataBean marketSummaryData = null;
Connection conn = null;
- if (Log.doActionTrace()) {
- Log.trace("TradeAction:getMarketSummary()");
- }
-
try {
if (Log.doTrace())
Log.trace("TradeJDBCDirect:getMarketSummary - inSession(" + this.inSession + ")");
@@ -200,9 +201,6 @@
Connection conn = null;
OrderDataBean orderData = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:buy", userID, symbol, new Double(quantity), new Integer(orderProcessingMode));
-
/*
* total = (quantity * purchasePrice) + orderFee
*/
@@ -256,9 +254,6 @@
Connection conn = null;
OrderDataBean orderData = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:sell", userID, holdingID, new Integer(orderProcessingMode));
-
/*
* total = (quantity * purchasePrice) + orderFee
*/
@@ -478,8 +473,6 @@
public void orderCompleted(String userID, Integer orderID) throws Exception {
// throw new UnsupportedOperationException("TradeJDBCDirect:orderCompleted method not supported");
- if (Log.doActionTrace())
- Log.trace("TradeAction:orderCompleted", userID, orderID);
if (Log.doTrace())
Log.trace("OrderCompleted", userID, orderID);
}
@@ -559,9 +552,6 @@
Collection orderDataBeans = new ArrayList();
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:getOrders", userID);
-
try {
if (Log.doTrace())
Log.trace("TradeJDBCDirect:getOrders - inSession(" + this.inSession + ")", userID);
@@ -601,9 +591,6 @@
Collection orderDataBeans = new ArrayList();
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:getClosedOrders", userID);
-
try {
if (Log.doTrace())
Log.trace("TradeJDBCDirect:getClosedOrders - inSession(" + this.inSession + ")", userID);
@@ -641,9 +628,6 @@
QuoteDataBean quoteData = null;
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:createQuote", symbol, companyName, price);
-
try {
if (Log.doTrace())
Log.traceEnter("TradeJDBCDirect:createQuote - inSession(" + this.inSession + ")");
@@ -666,7 +650,7 @@
stmt.close();
commit(conn);
- quoteData = new QuoteDataBean(symbol, companyName, volume, price, price, price, price, change);
+ quoteData = new QuoteDataBeanImpl(symbol, companyName, volume, price, price, price, price, change);
if (Log.doTrace())
Log.traceExit("TradeJDBCDirect:createQuote");
} catch (Exception e) {
@@ -686,15 +670,11 @@
QuoteDataBean quoteData = null;
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:getQuote", symbol);
-
-
if ((symbol == null) || (symbol.length() == 0) || (symbol.length() > 10)) {
- if (Log.doActionTrace()) {
- Log.trace("TradeAction:getQuote --- primitive workload");
+ if (Log.doTrace()) {
+ Log.trace("TradeJDBCDirect:getQuote --- primitive workload");
}
- return new QuoteDataBean("Invalid symbol", "", 0.0, FinancialUtils.ZERO, FinancialUtils.ZERO, FinancialUtils.ZERO, FinancialUtils.ZERO, 0.0);
+ return new QuoteDataBeanImpl("Invalid symbol", "", 0.0, FinancialUtils.ZERO, FinancialUtils.ZERO, FinancialUtils.ZERO, FinancialUtils.ZERO, 0.0);
}
try {
@@ -758,8 +738,8 @@
QuoteDataBean quoteData = null;
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:getAllQuotes");
+ if (Log.doTrace())
+ Log.trace("TradeJDBCDirect:getAllQuotes");
try {
conn = getConn();
@@ -792,9 +772,6 @@
Collection holdingDataBeans = new ArrayList();
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:getHoldings", userID);
-
try {
if (Log.doTrace())
Log.trace("TradeJDBCDirect:getHoldings - inSession(" + this.inSession + ")", userID);
@@ -830,9 +807,6 @@
HoldingDataBean holdingData = null;
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:getHolding", holdingID);
-
try {
if (Log.doTrace())
Log.trace("TradeJDBCDirect:getHolding - inSession(" + this.inSession + ")", holdingID);
@@ -856,9 +830,6 @@
*/
public AccountDataBean getAccountData(String userID) throws Exception {
- if (Log.doActionTrace())
- Log.trace("TradeAction:getAccountData", userID);
-
try {
AccountDataBean accountData = null;
Connection conn = null;
@@ -1039,9 +1010,6 @@
AccountProfileDataBean accountProfileData = null;
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:getAccountProfileData", userID);
-
try {
if (Log.doTrace())
Log.trace("TradeJDBCDirect:getAccountProfileData - inSession(" + this.inSession + ")", userID);
@@ -1103,23 +1071,19 @@
/**
* @see TradeServices#updateAccountProfile(AccountProfileDataBean)
*/
- public AccountProfileDataBean updateAccountProfile(AccountProfileDataBean profileData) throws Exception {
+ public AccountProfileDataBean updateAccountProfile(String userID, String password, String fullName, String address, String email, String creditcard) throws Exception {
AccountProfileDataBean accountProfileData = null;
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:updateAccountProfile", accountProfileData);
-
try {
if (Log.doTrace())
- Log.trace("TradeJDBCDirect:updateAccountProfileData - inSession(" + this.inSession + ")", profileData
- .getUserID());
+ Log.trace("TradeJDBCDirect:updateAccountProfileData - inSession(" + this.inSession + ")", userID);
conn = getConn();
- updateAccountProfile(conn, profileData);
+ updateAccountProfile(conn, userID, password, fullName, address, email, creditcard);
- accountProfileData = getAccountProfileData(conn, profileData.getUserID());
+ accountProfileData = getAccountProfileData(conn, userID);
commit(conn);
} catch (Exception e) {
Log.error("TradeJDBCDirect:getAccountProfileData -- error getting profile data", e);
@@ -1172,15 +1136,15 @@
stmt.close();
}
- private void updateAccountProfile(Connection conn, AccountProfileDataBean profileData) throws Exception {
+ private void updateAccountProfile(Connection conn, String userID, String password, String fullName, String address, String email, String creditcard) throws Exception {
PreparedStatement stmt = getStatement(conn, updateAccountProfileSQL);
- stmt.setString(1, profileData.getPassword());
- stmt.setString(2, profileData.getFullName());
- stmt.setString(3, profileData.getAddress());
- stmt.setString(4, profileData.getEmail());
- stmt.setString(5, profileData.getCreditCard());
- stmt.setString(6, profileData.getUserID());
+ stmt.setString(1, password);
+ stmt.setString(2, fullName);
+ stmt.setString(3, address);
+ stmt.setString(4, email);
+ stmt.setString(5, creditcard);
+ stmt.setString(6, userID);
int count = stmt.executeUpdate();
stmt.close();
@@ -1199,8 +1163,8 @@
public QuoteDataBean updateQuotePriceVolume(String symbol, BigDecimal changeFactor, double sharesTraded)
throws Exception {
- if (Log.doActionTrace())
- Log.trace("TradeAction:updateQuotePriceVolume", symbol, changeFactor, new Double(sharesTraded));
+ if (Log.doTrace())
+ Log.trace("TradeJDBCDirect:updateQuotePriceVolume", symbol, changeFactor, new Double(sharesTraded));
return updateQuotePriceVolumeInt(symbol, changeFactor, sharesTraded, TradeConfig.getPublishQuotePriceChange());
}
@@ -1222,7 +1186,7 @@
boolean publishQuotePriceChange) throws Exception {
if (TradeConfig.getUpdateQuotePrices() == false)
- return new QuoteDataBean();
+ return new QuoteDataBeanImpl();
QuoteDataBean quoteData = null;
Connection conn = null;
@@ -1292,9 +1256,6 @@
AccountDataBean accountData = null;
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:login", userID, password);
-
try {
if (Log.doTrace())
Log.trace("TradeJDBCDirect:login - inSession(" + this.inSession + ")", userID, password);
@@ -1356,9 +1317,6 @@
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:logout", userID);
-
if (Log.doTrace())
Log.trace("TradeJDBCDirect:logout - inSession(" + this.inSession + ")", userID);
try {
@@ -1387,9 +1345,6 @@
AccountDataBean accountData = null;
Connection conn = null;
- if (Log.doActionTrace())
- Log.trace("TradeAction:register", userID, password, fullname, address, email, creditCard, openBalance);
-
try {
if (Log.doTrace())
Log.traceEnter("TradeJDBCDirect:register - inSession(" + this.inSession + ")");
@@ -1428,7 +1383,7 @@
commit(conn);
accountData =
- new AccountDataBean(accountID, loginCount, logoutCount, lastLogin, creationDate, balance, openBalance,
+ new AccountDataBeanImpl(accountID, loginCount, logoutCount, lastLogin, creationDate, balance, openBalance,
userID);
if (Log.doTrace())
Log.traceExit("TradeJDBCDirect:register");
@@ -1448,7 +1403,7 @@
else
accountData =
- new AccountDataBean(new Integer(rs.getInt("accountID")), rs.getInt("loginCount"), rs
+ new AccountDataBeanImpl(new Integer(rs.getInt("accountID")), rs.getInt("loginCount"), rs
.getInt("logoutCount"), rs.getTimestamp("lastLogin"), rs.getTimestamp("creationDate"), rs
.getBigDecimal("balance"), rs.getBigDecimal("openBalance"), rs.getString("profile_userID"));
return accountData;
@@ -1461,7 +1416,7 @@
Log.error("TradeJDBCDirect:getAccountProfileDataFromResultSet -- cannot find accountprofile data");
else
accountProfileData =
- new AccountProfileDataBean(rs.getString("userID"), rs.getString("passwd"), rs.getString("fullName"), rs
+ new AccountProfileDataBeanImpl(rs.getString("userID"), rs.getString("passwd"), rs.getString("fullName"), rs
.getString("address"), rs.getString("email"), rs.getString("creditCard"));
return accountProfileData;
@@ -1471,7 +1426,7 @@
HoldingDataBean holdingData = null;
holdingData =
- new HoldingDataBean(new Integer(rs.getInt("holdingID")), rs.getDouble("quantity"), rs
+ new HoldingDataBeanImpl(new Integer(rs.getInt("holdingID")), rs.getDouble("quantity"), rs
.getBigDecimal("purchasePrice"), rs.getTimestamp("purchaseDate"), rs.getString("quote_symbol"));
return holdingData;
}
@@ -1480,7 +1435,7 @@
QuoteDataBean quoteData = null;
quoteData =
- new QuoteDataBean(rs.getString("symbol"), rs.getString("companyName"), rs.getDouble("volume"), rs
+ new QuoteDataBeanImpl(rs.getString("symbol"), rs.getString("companyName"), rs.getDouble("volume"), rs
.getBigDecimal("price"), rs.getBigDecimal("open1"), rs.getBigDecimal("low"), rs.getBigDecimal("high"),
rs.getDouble("change1"));
return quoteData;
@@ -1490,7 +1445,7 @@
OrderDataBean orderData = null;
orderData =
- new OrderDataBean(new Integer(rs.getInt("orderID")), rs.getString("orderType"),
+ new OrderDataBeanImpl(new Integer(rs.getInt("orderID")), rs.getString("orderType"),
rs.getString("orderStatus"), rs.getTimestamp("openDate"), rs.getTimestamp("completionDate"), rs
.getDouble("quantity"), rs.getBigDecimal("price"), rs.getBigDecimal("orderFee"), rs
.getString("quote_symbol"));
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml Wed Jan 13 17:51:05 2010
@@ -75,9 +75,10 @@
<!--org.apache.geronimo.samples.daytrader.persist.jpa;version=1.0.0-->
</Export-Package>
<Import-Package>
+ org.apache.geronimo.samples.daytrader.api;version=1.0,
org.apache.geronimo.samples.daytrader.beans;version=1.0,
+ org.apache.geronimo.samples.daytrader.persistence.api;version=1.0,
org.apache.geronimo.samples.daytrader.util;version=1.0,
- org.apache.geronimo.samples.daytrader.api;version=1.0,
javax.persistence;version=1.0.0
</Import-Package>
<Private-Package>
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java Wed Jan 13 17:51:05 2010
@@ -26,13 +26,18 @@
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
-import org.apache.geronimo.samples.daytrader.beans.AccountDataBean;
-import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean;
-import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
-import org.apache.geronimo.samples.daytrader.beans.MarketSummaryDataBean;
-import org.apache.geronimo.samples.daytrader.beans.OrderDataBean;
-import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
import org.apache.geronimo.samples.daytrader.api.TradeServices;
+import org.apache.geronimo.samples.daytrader.beans.AccountDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.beans.HoldingDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.beans.OrderDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.beans.QuoteDataBeanImpl;
+import org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.AccountProfileDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.MarketSummaryDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.OrderDataBean;
+import org.apache.geronimo.samples.daytrader.persistence.api.QuoteDataBean;
import org.apache.geronimo.samples.daytrader.util.FinancialUtils;
import org.apache.geronimo.samples.daytrader.util.Log;
import org.apache.geronimo.samples.daytrader.util.TradeConfig;
@@ -157,10 +162,10 @@
if (Log.doTrace())
Log.trace("TradeJPADirect:buy", userID, symbol, quantity, orderProcessingMode);
- AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+ AccountProfileDataBean profile = entityManager.find(AccountProfileDataBeanImpl.class, userID);
AccountDataBean account = profile.getAccount();
- QuoteDataBean quote = entityManager.find(QuoteDataBean.class, symbol);
+ QuoteDataBean quote = entityManager.find(QuoteDataBeanImpl.class, symbol);
HoldingDataBean holding = null; // The holding will be created by this buy order
@@ -206,17 +211,17 @@
if (Log.doTrace())
Log.trace("TradeJPADirect:sell", userID, holdingID, orderProcessingMode);
- AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+ AccountProfileDataBean profile = entityManager.find(AccountProfileDataBeanImpl.class, userID);
AccountDataBean account = profile.getAccount();
- HoldingDataBean holding = entityManager.find(HoldingDataBean.class, holdingID);
+ HoldingDataBean holding = entityManager.find(HoldingDataBeanImpl.class, holdingID);
if (holding == null) {
Log.error("TradeJPADirect:sell User " + userID
+ " attempted to sell holding " + holdingID
+ " which has already been sold");
- OrderDataBean orderData = new OrderDataBean();
+ OrderDataBean orderData = new OrderDataBeanImpl();
orderData.setOrderStatus("cancelled");
entityManager.persist(orderData);
@@ -278,7 +283,7 @@
if (Log.doTrace())
Log.trace("TradeJPADirect:completeOrder", orderID + " twoPhase=" + twoPhase);
- order = entityManager.find(OrderDataBean.class, orderID);
+ order = entityManager.find(OrderDataBeanImpl.class, orderID);
order.getQuote();
if (order == null) {
@@ -358,7 +363,7 @@
if (Log.doTrace())
Log.trace("TradeJPADirect:cancelOrder", orderID + " twoPhase=" + twoPhase);
- OrderDataBean order = entityManager.find(OrderDataBean.class, orderID);
+ OrderDataBean order = entityManager.find(OrderDataBeanImpl.class, orderID);
order.cancel();
}
@@ -372,7 +377,7 @@
public Collection<OrderDataBean> getOrders(String userID) {
if (Log.doTrace())
Log.trace("TradeJPADirect:getOrders", userID);
- AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+ AccountProfileDataBean profile = entityManager.find(AccountProfileDataBeanImpl.class, userID);
AccountDataBean account = profile.getAccount();
return account.getOrders();
}
@@ -421,7 +426,7 @@
+ "a.OPENBALANCE, "
+ "a.PROFILE_USERID "
+ "from accountejb a where a.profile_userid = ?",
- org.apache.geronimo.samples.daytrader.beans.AccountDataBean.class);
+ org.apache.geronimo.samples.daytrader.beans.AccountDataBeanImpl.class);
findaccountid.setParameter(1, userID);
AccountDataBean account = (AccountDataBean) findaccountid.getSingleResult();
Integer accountid = account.getAccountID();
@@ -444,7 +449,7 @@
public QuoteDataBean createQuote(String symbol, String companyName, BigDecimal price) {
try {
- QuoteDataBean quote = new QuoteDataBean(symbol, companyName, 0, price, price, price, price, 0);
+ QuoteDataBean quote = new QuoteDataBeanImpl(symbol, companyName, 0, price, price, price, price, 0);
entityManager.persist(quote);
if (Log.doTrace())
@@ -462,7 +467,7 @@
if (Log.doTrace())
Log.trace("TradeJPADirect:getQuote", symbol);
- QuoteDataBean qdb = entityManager.find(QuoteDataBean.class, symbol);
+ QuoteDataBean qdb = entityManager.find(QuoteDataBeanImpl.class, symbol);
return qdb;
}
@@ -479,7 +484,7 @@
public QuoteDataBean updateQuotePriceVolume(String symbol,
BigDecimal changeFactor, double sharesTraded) {
if (!TradeConfig.getUpdateQuotePrices())
- return new QuoteDataBean();
+ return new QuoteDataBeanImpl();
if (Log.doTrace())
Log.trace("TradeJPADirect:updateQuote", symbol, changeFactor);
@@ -491,7 +496,7 @@
*/
QuoteDataBean quote = null;
if (TradeConfig.jpaLayer == TradeConfig.HIBERNATE) {
- quote = entityManager.find(QuoteDataBean.class, symbol);
+ quote = entityManager.find(QuoteDataBeanImpl.class, symbol);
} else if (TradeConfig.jpaLayer == TradeConfig.OPENJPA) {
Query q = entityManager.createNamedQuery("quoteejb.quoteForUpdate");
@@ -541,14 +546,14 @@
public HoldingDataBean getHolding(Integer holdingID) {
if (Log.doTrace())
Log.trace("TradeJPADirect:getHolding", holdingID);
- return entityManager.find(HoldingDataBean.class, holdingID);
+ return entityManager.find(HoldingDataBeanImpl.class, holdingID);
}
public AccountDataBean getAccountData(String userID) {
if (Log.doTrace())
Log.trace("TradeJPADirect:getAccountData", userID);
- AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+ AccountProfileDataBean profile = entityManager.find(AccountProfileDataBeanImpl.class, userID);
/*
* Inflate the lazy data memebers
*/
@@ -565,15 +570,15 @@
if (Log.doTrace())
Log.trace("TradeJPADirect:getProfileData", userID);
- AccountProfileDataBean apb = entityManager.find(AccountProfileDataBean.class, userID);
+ AccountProfileDataBean apb = entityManager.find(AccountProfileDataBeanImpl.class, userID);
return apb;
}
- public AccountProfileDataBean updateAccountProfile(AccountProfileDataBean profileData) {
+ public AccountProfileDataBean updateAccountProfile(String userID, String password, String fullName, String address, String email, String creditcard) throws Exception {
if (Log.doTrace())
- Log.trace("TradeJPADirect:updateAccountProfileData", profileData);
+ Log.trace("TradeJPADirect:updateAccountProfileData", userID);
/*
* // Retrieve the previous account profile in order to get account
* data... hook it into new object AccountProfileDataBean temp =
@@ -588,12 +593,12 @@
* entityManager.merge(profileData); //System.out.println(temp);
*/
- AccountProfileDataBean temp = entityManager.find(AccountProfileDataBean.class, profileData.getUserID());
- temp.setAddress(profileData.getAddress());
- temp.setPassword(profileData.getPassword());
- temp.setFullName(profileData.getFullName());
- temp.setCreditCard(profileData.getCreditCard());
- temp.setEmail(profileData.getEmail());
+ AccountProfileDataBean temp = entityManager.find(AccountProfileDataBeanImpl.class, userID);
+ temp.setAddress(address);
+ temp.setPassword(password);
+ temp.setFullName(fullName);
+ temp.setCreditCard(creditcard);
+ temp.setEmail(email);
entityManager.merge(temp);
return temp;
@@ -602,7 +607,7 @@
public AccountDataBean login(String userID, String password)
throws Exception {
- AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+ AccountProfileDataBean profile = entityManager.find(AccountProfileDataBeanImpl.class, userID);
if (profile == null) {
throw new RuntimeException("No such user: " + userID);
@@ -624,7 +629,7 @@
if (Log.doTrace())
Log.trace("TradeJPADirect:logout", userID);
- AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+ AccountProfileDataBean profile = entityManager.find(AccountProfileDataBeanImpl.class, userID);
AccountDataBean account = profile.getAccount();
account.logout();
@@ -644,16 +649,16 @@
// Check to see if a profile with the desired userID already exists
- profile = entityManager.find(AccountProfileDataBean.class, userID);
+ profile = entityManager.find(AccountProfileDataBeanImpl.class, userID);
if (profile != null) {
Log.error("Failed to register new Account - AccountProfile with userID(" + userID + ") already exists");
return null;
}
else {
- profile = new AccountProfileDataBean(userID, password, fullname,
+ profile = new AccountProfileDataBeanImpl(userID, password, fullname,
address, email, creditcard);
- account = new AccountDataBean(0, 0, null, new Timestamp(System.currentTimeMillis()), openBalance, openBalance, userID);
+ account = new AccountDataBeanImpl(0, 0, null, new Timestamp(System.currentTimeMillis()), openBalance, openBalance, userID);
profile.setAccount(account);
account.setProfile(profile);
entityManager.persist(profile);
@@ -685,7 +690,7 @@
+ " quote=" + ((quote == null) ? null : quote.getSymbol())
+ " orderType=" + orderType + " quantity=" + quantity);
try {
- order = new OrderDataBean(orderType,
+ order = new OrderDataBeanImpl(orderType,
"open",
new Timestamp(System.currentTimeMillis()),
null,
@@ -706,7 +711,7 @@
private HoldingDataBean createHolding(AccountDataBean account,
QuoteDataBean quote, double quantity, BigDecimal purchasePrice) throws Exception {
- HoldingDataBean newHolding = new HoldingDataBean(quantity,
+ HoldingDataBean newHolding = new HoldingDataBeanImpl(quantity,
purchasePrice, new Timestamp(System.currentTimeMillis()),
account, quote);
entityManager.persist(newHolding);
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml Wed Jan 13 17:51:05 2010
@@ -50,6 +50,7 @@
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
<artifactId>daytrader-entities</artifactId>
@@ -66,6 +67,7 @@
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
@@ -111,8 +113,9 @@
<Web-ContextPath>/daytrader</Web-ContextPath>
<Web-JSPExtractLocation>/</Web-JSPExtractLocation>
<Import-Package>
- org.apache.geronimo.samples.daytrader.beans;version=1.0,
+ <!--org.apache.geronimo.samples.daytrader.beans;version=1.0,-->
org.apache.geronimo.samples.daytrader.api;version=1.0,
+ org.apache.geronimo.samples.daytrader.persistence.api;version=1.0,
org.apache.geronimo.samples.daytrader.util;version=1.0,
javax.naming,
javax.servlet,
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java Wed Jan 13 17:51:05 2010
@@ -23,11 +23,11 @@
import java.math.BigDecimal;
import java.util.ArrayList;
-import org.apache.geronimo.samples.daytrader.beans.*;
import org.apache.geronimo.samples.daytrader.api.TradeDBManager;
import org.apache.geronimo.samples.daytrader.api.TradeServicesManager;
import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
import org.apache.geronimo.samples.daytrader.api.TradeServices;
+import org.apache.geronimo.samples.daytrader.persistence.api.*;
import org.apache.geronimo.samples.daytrader.util.*;
/**
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java Wed Jan 13 17:51:05 2010
@@ -19,9 +19,9 @@
import javax.servlet.*;
import javax.servlet.http.*;
-import org.apache.geronimo.samples.daytrader.beans.RunStatsDataBean;
import org.apache.geronimo.samples.daytrader.api.TradeDBManager;
import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.persistence.api.RunStatsDataBean;
import org.apache.geronimo.samples.daytrader.util.Log;
import org.apache.geronimo.samples.daytrader.util.TradeConfig;
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeScenarioServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeScenarioServlet.java?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeScenarioServlet.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeScenarioServlet.java Wed Jan 13 17:51:05 2010
@@ -19,7 +19,7 @@
import javax.servlet.*;
import javax.servlet.http.*;
-import org.apache.geronimo.samples.daytrader.beans.*;
+import org.apache.geronimo.samples.daytrader.persistence.api.*;
import org.apache.geronimo.samples.daytrader.util.*;
import java.util.Collection;
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java Wed Jan 13 17:51:05 2010
@@ -22,9 +22,9 @@
import javax.servlet.*;
import javax.servlet.http.*;
-import org.apache.geronimo.samples.daytrader.beans.*;
import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
import org.apache.geronimo.samples.daytrader.api.TradeServices;
+import org.apache.geronimo.samples.daytrader.persistence.api.*;
import org.apache.geronimo.samples.daytrader.util.*;
import java.io.IOException;
@@ -160,12 +160,11 @@
results = "Update profile error: please fill in all profile information fields";
doUpdate = false;
}
- AccountProfileDataBean accountProfileData = new AccountProfileDataBean(
- userID, password, fullName, address, email, creditcard);
+// AccountProfileDataBean accountProfileData = new AccountProfileDataBean(
+// userID, password, fullName, address, email, creditcard);
try {
if (doUpdate) {
- accountProfileData = tradeServices
- .updateAccountProfile(accountProfileData);
+ tradeServices.updateAccountProfile(userID, password, fullName, address, email, creditcard);
results = "Account profile update successful";
}
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCRead.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCRead.java?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCRead.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCRead.java Wed Jan 13 17:51:05 2010
@@ -20,9 +20,9 @@
import javax.servlet.*;
import javax.servlet.http.*;
-import org.apache.geronimo.samples.daytrader.beans.*;
import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
import org.apache.geronimo.samples.daytrader.api.TradeServices;
+import org.apache.geronimo.samples.daytrader.persistence.api.*;
import org.apache.geronimo.samples.daytrader.util.*;
/**
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java Wed Jan 13 17:51:05 2010
@@ -21,9 +21,9 @@
import javax.servlet.*;
import javax.servlet.http.*;
-import org.apache.geronimo.samples.daytrader.beans.*;
import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
import org.apache.geronimo.samples.daytrader.api.TradeServices;
+import org.apache.geronimo.samples.daytrader.persistence.api.*;
import org.apache.geronimo.samples.daytrader.util.*;
/**
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/PingJspEL.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/PingJspEL.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/PingJspEL.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/PingJspEL.jsp Wed Jan 13 17:51:05 2010
@@ -20,7 +20,7 @@
<title>PingJspEL</title>
</head>
<body>
-<%@ page import="org.apache.geronimo.samples.daytrader.util.*,org.apache.geronimo.samples.daytrader.beans.*" session="false" %>
+<%@ page import="org.apache.geronimo.samples.daytrader.util.*,org.apache.geronimo.samples.daytrader.persistence.api.*" session="false" %>
<%!
int hitCount = 0;
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/account.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/account.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/account.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/account.jsp Wed Jan 13 17:51:05 2010
@@ -23,14 +23,14 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.api.*,org.apache.geronimo.samples.daytrader.beans.*,org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.api.*,org.apache.geronimo.samples.daytrader.persistence.api.*,org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean"
scope="request" />
<jsp:useBean id="accountProfileData"
- type="org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean"
+ type="org.apache.geronimo.samples.daytrader.persistence.api.AccountProfileDataBean"
scope="request" />
<jsp:useBean id="orderDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/accountImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/accountImg.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/accountImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/accountImg.jsp Wed Jan 13 17:51:05 2010
@@ -23,14 +23,14 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean"
scope="request" />
<jsp:useBean id="accountProfileData"
- type="org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean"
+ type="org.apache.geronimo.samples.daytrader.persistence.api.AccountProfileDataBean"
scope="request" />
<jsp:useBean id="orderDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp Wed Jan 13 17:51:05 2010
@@ -15,7 +15,7 @@
limitations under the License.
-->
<%@ page
- import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<%
String symbol = request.getParameter("symbol");
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp Wed Jan 13 17:51:05 2010
@@ -15,7 +15,7 @@
limitations under the License.
-->
<%@ page
- import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<%
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/order.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/order.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/order.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/order.jsp Wed Jan 13 17:51:05 2010
@@ -22,7 +22,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<TABLE height="54">
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/orderImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/orderImg.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/orderImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/orderImg.jsp Wed Jan 13 17:51:05 2010
@@ -22,7 +22,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<TABLE height="54">
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolio.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolio.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolio.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolio.jsp Wed Jan 13 17:51:05 2010
@@ -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.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection" scope="request" />
<jsp:useBean id="quoteDataBeans" type="java.util.Collection" scope="request"/>
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolioImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolioImg.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolioImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolioImg.jsp Wed Jan 13 17:51:05 2010
@@ -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.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quote.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quote.jsp Wed Jan 13 17:51:05 2010
@@ -23,7 +23,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<TABLE height="54">
<TBODY>
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quoteImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quoteImg.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quoteImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quoteImg.jsp Wed Jan 13 17:51:05 2010
@@ -24,7 +24,7 @@
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<TABLE height="54">
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/runStats.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/runStats.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/runStats.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/runStats.jsp Wed Jan 13 17:51:05 2010
@@ -25,7 +25,7 @@
session="false" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean
- class="org.apache.geronimo.samples.daytrader.beans.RunStatsDataBean"
+ class="org.apache.geronimo.samples.daytrader.persistence.api.RunStatsDataBean"
id="runStatsData" scope="request" />
<%
double loginPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.LOGOUT_OP]) / 100.0;
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehome.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehome.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehome.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehome.jsp Wed Jan 13 17:51:05 2010
@@ -23,11 +23,11 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean"
scope="request" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehomeImg.jsp?rev=898859&r1=898858&r2=898859&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehomeImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehomeImg.jsp Wed Jan 13 17:51:05 2010
@@ -23,11 +23,11 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean"
scope="request" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
scope="request" />