geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r809686 [4/6] - in /geronimo/daytrader/trunk/modules: ./ beans/ beans/src/ beans/src/main/ beans/src/main/java/ beans/src/main/java/org/ beans/src/main/java/org/apache/ beans/src/main/java/org/apache/geronimo/ beans/src/main/java/org/apache...
Date Mon, 31 Aug 2009 18:48:45 GMT
Added: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeJPADirect.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeJPADirect.java?rev=809686&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeJPADirect.java (added)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeJPADirect.java Mon Aug 31 18:48:41 2009
@@ -0,0 +1,770 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.samples.daytrader.direct;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.ArrayList;
+import javax.naming.InitialContext;
+
+import javax.sql.DataSource;
+
+import org.apache.geronimo.samples.daytrader.*;
+import org.apache.geronimo.samples.daytrader.util.*;
+
+import java.rmi.RemoteException;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+
+
+/**
+ * TradeJPADirect uses JPA to implement the business methods of the
+ * Trade online broker application. These business methods represent the
+ * features and operations that can be performed by customers of the brokerage
+ * such as login, logout, get a stock quote, buy or sell a stock, etc. and are
+ * specified in the {@link org.apache.geronimo.samples.daytrader.TradeServices}
+ * interface
+ * 
+ * Note: In order for this class to be thread-safe, a new TradeJPA must be
+ * created for each call to a method from the TradeInterface interface.
+ * Otherwise, pooled connections may not be released.
+ * 
+ * @see org.apache.geronimo.samples.daytrader.TradeServices
+ * 
+ */
+
+public class TradeJPADirect implements TradeServices {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    private static BigDecimal ZERO = new BigDecimal(0.0);
+
+    private static boolean initialized = false;
+
+    /**
+     * Zero arg constructor for TradeJPADirect
+     */
+    public TradeJPADirect() {
+        if (initialized == false)
+            init();
+    }
+
+    public static synchronized void init() {
+        if (initialized)
+            return;
+        if (Log.doTrace())
+            Log.trace("TradeJPADirect:init -- *** initializing");
+
+        TradeConfig.setPublishQuotePriceChange(false);
+
+        if (Log.doTrace())
+            Log.trace("TradeJPADirect:init -- +++ initialized");
+
+        initialized = true;
+    }
+
+    public static void destroy() {
+        try {
+            if (!initialized)
+                return;
+            Log.trace("TradeJPADirect:destroy");
+        } catch (Exception e) {
+            Log.error("TradeJPADirect:destroy", e);
+        }
+    }
+
+    public MarketSummaryDataBean getMarketSummary() {
+        MarketSummaryDataBean marketSummaryData;
+        
+        try {
+            if (Log.doTrace())
+                Log.trace("TradeSLSBBean:getMarketSummary -- getting market summary");
+
+            // Find Trade Stock Index Quotes (Top 100 quotes)
+            // ordered by their change in value
+            Collection<QuoteDataBean> quotes;
+
+            Query query = entityManager.createNamedQuery("quoteejb.quotesByChange");
+            quotes = query.getResultList();
+
+            QuoteDataBean[] quoteArray = (QuoteDataBean[]) quotes.toArray(new QuoteDataBean[quotes.size()]);
+            ArrayList<QuoteDataBean> topGainers = new ArrayList<QuoteDataBean>(5);
+            ArrayList<QuoteDataBean> topLosers = new ArrayList<QuoteDataBean>(5);
+            BigDecimal TSIA = FinancialUtils.ZERO;
+            BigDecimal openTSIA = FinancialUtils.ZERO;
+            double totalVolume = 0.0;
+
+            if (quoteArray.length > 5) {
+                for (int i = 0; i < 5; i++)
+                    topGainers.add(quoteArray[i]);
+                for (int i = quoteArray.length - 1; i >= quoteArray.length - 5; i--)
+                    topLosers.add(quoteArray[i]);
+
+                for (QuoteDataBean quote : quoteArray) {
+                    BigDecimal price = quote.getPrice();
+                    BigDecimal open = quote.getOpen();
+                    double volume = quote.getVolume();
+                    TSIA = TSIA.add(price);
+                    openTSIA = openTSIA.add(open);
+                    totalVolume += volume;
+                }
+                TSIA = TSIA.divide(new BigDecimal(quoteArray.length), FinancialUtils.ROUND);
+                openTSIA = openTSIA.divide(new BigDecimal(quoteArray.length), FinancialUtils.ROUND);
+            }
+
+            marketSummaryData = new MarketSummaryDataBean(TSIA, openTSIA, totalVolume, topGainers, topLosers);
+        } catch (Exception e) {
+            Log.error("TradeSLSBBean:getMarketSummary", e);
+            throw new EJBException("TradeSLSBBean:getMarketSummary -- error ", e);
+        }
+        return marketSummaryData;
+    }
+
+    public OrderDataBean buy(String userID, String symbol, double quantity, int orderProcessingMode) {
+        OrderDataBean order;
+        BigDecimal total;
+        try {
+            if (Log.doTrace())
+                Log.trace("TradeSLSBBean:buy", userID, symbol, quantity, orderProcessingMode);
+
+            AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+            AccountDataBean account = profile.getAccount();
+            QuoteDataBean quote = entityManager.find(QuoteDataBean.class, symbol);
+            HoldingDataBean holding = null; // The holding will be created by this buy order
+
+            order = createOrder(account, quote, holding, "buy", quantity);
+
+            // UPDATE - account should be credited during completeOrder
+            BigDecimal price = quote.getPrice();
+            BigDecimal orderFee = order.getOrderFee();
+            BigDecimal balance = account.getBalance();
+            total = (new BigDecimal(quantity).multiply(price)).add(orderFee);
+            account.setBalance(balance.subtract(total));
+
+            if (orderProcessingMode == TradeConfig.SYNCH)
+                completeOrder(order.getOrderID(), false);
+            else if (orderProcessingMode == TradeConfig.ASYNCH_2PHASE)
+                queueOrder(order.getOrderID(), true);
+        } catch (Exception e) {
+            Log.error("TradeSLSBBean:buy(" + userID + "," + symbol + "," + quantity + ") --> failed", e);
+            /* On exception - cancel the order */
+            // TODO figure out how to do this with JPA
+            // if (order != null) order.cancel();
+            throw new EJBException(e);
+        }
+        return order;
+    }
+
+    public OrderDataBean sell(String userID, Integer holdingID, int orderProcessingMode) {
+        OrderDataBean order;
+        BigDecimal total;
+        try {
+            if (Log.doTrace())
+                Log.trace("TradeSLSBBean:sell", userID, holdingID, orderProcessingMode);
+
+            AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+            AccountDataBean account = profile.getAccount();
+            HoldingDataBean holding = entityManager.find(HoldingDataBean.class, holdingID);
+            
+            if (holding == null) {
+                Log.error("TradeSLSBBean:sell User " + userID + " attempted to sell holding " + holdingID + " which has already been sold");
+                
+                OrderDataBean orderData = new OrderDataBean();
+                orderData.setOrderStatus("cancelled");
+                entityManager.persist(orderData);
+                
+                return orderData;
+            }            
+
+            QuoteDataBean quote = holding.getQuote();
+            double quantity = holding.getQuantity();
+            order = createOrder(account, quote, holding, "sell", quantity);
+
+            // UPDATE the holding purchase data to signify this holding is "inflight" to be sold
+            // -- could add a new holdingStatus attribute to holdingEJB
+            holding.setPurchaseDate(new java.sql.Timestamp(0));
+
+            // UPDATE - account should be credited during completeOrder
+            BigDecimal price = quote.getPrice();
+            BigDecimal orderFee = order.getOrderFee();
+            BigDecimal balance = account.getBalance();
+            total = (new BigDecimal(quantity).multiply(price)).subtract(orderFee);
+            account.setBalance(balance.add(total));
+
+            if (orderProcessingMode == TradeConfig.SYNCH)
+                completeOrder(order.getOrderID(), false);
+            else if (orderProcessingMode == TradeConfig.ASYNCH_2PHASE)
+                queueOrder(order.getOrderID(), true);
+
+        } catch (Exception e) {
+            Log.error("TradeSLSBBean:sell(" + userID + "," + holdingID + ") --> failed", e);
+            // TODO figure out JPA cancel
+            // if (order != null) order.cancel();
+            // UPDATE - handle all exceptions like:
+            throw new EJBException("TradeSLSBBean:sell(" + userID + "," + holdingID + ")", e);
+        }
+        return order;
+    }
+
+    public void queueOrder(Integer orderID, boolean twoPhase) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:queueOrder", orderID);
+
+        Connection conn = null;
+        Session sess = null;
+        try {
+            conn = queueConnectionFactory.createConnection();
+            sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            MessageProducer msgProducer = sess.createProducer(tradeBrokerQueue);
+            TextMessage message = sess.createTextMessage();
+
+            message.setStringProperty("command", "neworder");
+            message.setIntProperty("orderID", orderID);
+            message.setBooleanProperty("twoPhase", twoPhase);
+            message.setText("neworder: orderID=" + orderID + " runtimeMode=EJB twoPhase=" + twoPhase);
+            message.setLongProperty("publishTime", System.currentTimeMillis());
+
+            if (Log.doTrace())
+                Log.trace("TradeSLSBBean:queueOrder Sending message: " + message.getText());
+            msgProducer.send(message);
+        } catch (javax.jms.JMSException e) {
+            throw new EJBException(e.getMessage(), e); // pass the exception back
+        } finally {
+            try {
+                if (conn != null)
+                    conn.close();
+                if (sess != null)
+                    sess.close();
+            } catch (javax.jms.JMSException e) {
+                throw new EJBException(e.getMessage(), e); // pass the exception back
+            }
+        }
+    }
+
+    public OrderDataBean completeOrder(Integer orderID, boolean twoPhase)
+            throws Exception {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:completeOrder", orderID + " twoPhase=" + twoPhase);
+
+        OrderDataBean order = entityManager.find(OrderDataBean.class, orderID);
+        order.getQuote();
+
+        if (order == null) {
+            Log.error("TradeSLSBBean:completeOrder -- Unable to find Order " + orderID + " FBPK returned " + order);
+            return null;
+        }
+
+        if (order.isCompleted())
+            throw new EJBException("Error: attempt to complete Order that is already completed\n" + order);
+
+        AccountDataBean account = order.getAccount();
+        QuoteDataBean quote = order.getQuote();
+        HoldingDataBean holding = order.getHolding();
+        BigDecimal price = order.getPrice();
+        double quantity = order.getQuantity();
+
+        String userID = account.getProfile().getUserID();
+
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBeanInternal:completeOrder--> Completing Order " + order.getOrderID() 
+                    + "\n\t Order info: " + order
+                    + "\n\t Account info: " + account 
+                    + "\n\t Quote info: " + quote 
+                    + "\n\t Holding info: " + holding);
+
+        if (order.isBuy()) {
+            /*
+             * Complete a Buy operation 
+             * - create a new Holding for the Account 
+             * - deduct the Order cost from the Account balance
+             */
+
+            HoldingDataBean newHolding = createHolding(account, quote, quantity, price);
+            order.setHolding(newHolding);
+        }
+
+        if (order.isSell()) {
+            /*
+             * Complete a Sell operation 
+             * - remove the Holding from the Account 
+             * - deposit the Order proceeds to the Account balance
+             */
+            if (holding == null) {
+                Log.error("TradeSLSBBean:completeOrder -- Unable to sell order " + order.getOrderID() + " holding already sold");
+                order.cancel();
+                return order;
+            } else {
+                entityManager.remove(holding);
+                order.setHolding(null);
+            }
+        }
+        order.setOrderStatus("closed");
+
+        order.setCompletionDate(new java.sql.Timestamp(System.currentTimeMillis()));
+
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:completeOrder--> Completed Order " + order.getOrderID() 
+                    + "\n\t Order info: " + order
+                    + "\n\t Account info: " + account 
+                    + "\n\t Quote info: " + quote 
+                    + "\n\t Holding info: " + holding);
+
+        //if (Log.doTrace())
+        //    Log.trace("Calling TradeAction:orderCompleted from Session EJB using Session Object");
+        // FUTURE All getEJBObjects could be local -- need to add local I/F
+
+        // commented out following call
+        // - orderCompleted doesn't really do anything (think it was a hook for old Trade caching code)
+        
+        /*TradeAction tradeAction = new TradeAction();
+        tradeAction.orderCompleted(userID, orderID);*/
+
+        return order;
+    }
+
+    public void cancelOrder(Integer orderID, boolean twoPhase) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:cancelOrder", orderID + " twoPhase=" + twoPhase);
+
+        OrderDataBean order = entityManager.find(OrderDataBean.class, orderID);
+        order.cancel();
+    }
+
+    public void orderCompleted(String userID, Integer orderID) {
+        throw new UnsupportedOperationException("TradeSLSBBean:orderCompleted method not supported");
+    }
+
+    public Collection<OrderDataBean> getOrders(String userID) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:getOrders", userID);
+
+        AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+        AccountDataBean account = profile.getAccount();
+        return account.getOrders();
+    }
+
+    public Collection<OrderDataBean> getClosedOrders(String userID) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:getClosedOrders", userID);
+
+        try {
+
+            // Get the primary keys for all the closed Orders for this
+            // account.
+            Query query = entityManager.createNamedQuery("orderejb.closedOrders");
+            query.setParameter("userID", userID);
+            Collection results = query.getResultList();
+            Iterator itr = results.iterator();
+            
+            // Spin through the orders to populate the lazy quote fields
+            while (itr.hasNext()){
+                OrderDataBean thisOrder = (OrderDataBean)itr.next();
+                thisOrder.getQuote();
+            }
+            
+            /* Add logic to do update orders operation, because JBoss5' Hibernate 3.3.1GA DB2Dialect 
+             * and MySQL5Dialect do not work with annotated query "orderejb.completeClosedOrders"
+             * defined in OrderDatabean 
+             */
+            if (TradeConfig.jpaLayer == TradeConfig.OPENJPA) {
+                Query updateStatus = entityManager.createNamedQuery("orderejb.completeClosedOrders");
+                updateStatus.setParameter("userID", userID);
+                updateStatus.executeUpdate();
+                }
+                
+            if (TradeConfig.jpaLayer == TradeConfig.HIBERNATE) {
+                Query findaccountid = entityManager.createNativeQuery("select "+
+                                                                          "a.ACCOUNTID, "+
+                                                                          "a.LOGINCOUNT, "+
+                                                                          "a.LOGOUTCOUNT, "+
+                                                                          "a.LASTLOGIN, "+
+                                                                          "a.CREATIONDATE, "+
+                                                                          "a.BALANCE, "+
+                                                                          "a.OPENBALANCE, "+
+                                                                          "a.PROFILE_USERID "+
+                                                                          "from accountejb a where a.profile_userid = ?", org.apache.geronimo.samples.daytrader.AccountDataBean.class);
+                findaccountid.setParameter(1, userID);
+                AccountDataBean account = (AccountDataBean)findaccountid.getSingleResult();                
+                Integer accountid = account.getAccountID();
+                Query updateStatus = entityManager.createNativeQuery("UPDATE orderejb o SET o.orderStatus = 'completed' WHERE o.orderStatus = 'closed' AND o.ACCOUNT_ACCOUNTID  = ?");
+                updateStatus.setParameter(1, accountid.intValue());
+                updateStatus.executeUpdate();
+                }
+                
+            return results;
+        } catch (Exception e) {
+            Log.error("TradeSLSBBean.getClosedOrders", e);
+            throw new EJBException("TradeSLSBBean.getClosedOrders - error", e);
+        }
+    }
+
+    public QuoteDataBean createQuote(String symbol, String companyName, BigDecimal price) {
+        try {
+            QuoteDataBean quote = new QuoteDataBean(symbol, companyName, 0, price, price, price, price, 0);
+            entityManager.persist(quote);
+            if (Log.doTrace())
+                Log.trace("TradeSLSBBean:createQuote-->" + quote);
+            return quote;
+        } catch (Exception e) {
+            Log.error("TradeSLSBBean:createQuote -- exception creating Quote", e);
+            throw new EJBException(e);
+        }
+    }
+
+    public QuoteDataBean getQuote(String symbol) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:getQuote", symbol);
+
+        return entityManager.find(QuoteDataBean.class, symbol);
+    }
+
+    public Collection<QuoteDataBean> getAllQuotes() {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:getAllQuotes");
+
+        Query query = entityManager.createNamedQuery("quoteejb.allQuotes");
+        return query.getResultList();
+    }
+
+    public QuoteDataBean updateQuotePriceVolume(String symbol, BigDecimal changeFactor, double sharesTraded) {
+        if (!TradeConfig.getUpdateQuotePrices())
+            return new QuoteDataBean();
+
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:updateQuote", symbol, changeFactor);
+
+        /* Add logic to determine JPA layer, because JBoss5' Hibernate 3.3.1GA DB2Dialect 
+         * and MySQL5Dialect do not work with annotated query "quoteejb.quoteForUpdate"
+         * defined in QuoteDatabean 
+          */    
+        QuoteDataBean quote = new QuoteDataBean();
+        if (TradeConfig.jpaLayer == TradeConfig.HIBERNATE) {
+            quote = entityManager.find(QuoteDataBean.class, symbol);
+           }
+           
+        if (TradeConfig.jpaLayer == TradeConfig.OPENJPA) {
+            Query q = entityManager.createNamedQuery("quoteejb.quoteForUpdate");
+            q.setParameter(1, symbol);
+            quote = (QuoteDataBean) q.getSingleResult();
+           }       
+
+        BigDecimal oldPrice = quote.getPrice();
+
+        if (quote.getPrice().equals(TradeConfig.PENNY_STOCK_PRICE)) {
+            changeFactor = TradeConfig.PENNY_STOCK_RECOVERY_MIRACLE_MULTIPLIER;
+        }
+
+        BigDecimal newPrice = changeFactor.multiply(oldPrice).setScale(2, BigDecimal.ROUND_HALF_UP);
+
+        quote.setPrice(newPrice);
+        quote.setVolume(quote.getVolume() + sharesTraded);
+        entityManager.merge(quote);
+
+        // TODO find out if requires new here is really intended -- it is backwards,
+        // change can get published w/o it occurring.
+        // ((Trade) context.getEJBObject()).publishQuotePriceChange(quote,oldPrice, changeFactor, sharesTraded);
+        this.publishQuotePriceChange(quote, oldPrice, changeFactor, sharesTraded);
+
+        return quote;
+    }
+
+    public Collection<HoldingDataBean> getHoldings(String userID) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:getHoldings", userID);
+
+        Query query = entityManager.createNamedQuery("holdingejb.holdingsByUserID");
+        query.setParameter("userID", userID);
+        Collection<HoldingDataBean> holdings = query.getResultList();
+        /*
+         * Inflate the lazy data memebers
+        */
+        Iterator itr = holdings.iterator();
+        while (itr.hasNext()) {
+            ((HoldingDataBean) itr.next()).getQuote();
+        }
+
+        return holdings;
+    }
+
+    public HoldingDataBean getHolding(Integer holdingID) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:getHolding", holdingID);
+        return entityManager.find(HoldingDataBean.class, holdingID);
+    }
+
+    public AccountDataBean getAccountData(String userID) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:getAccountData", userID);
+
+        AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+        /*
+         * Inflate the lazy data memebers
+         */
+        AccountDataBean account = profile.getAccount();
+        account.getProfile();
+        
+        // Added to populate transient field for account
+        account.setProfileID(profile.getUserID());
+        return account;
+    }
+
+    public AccountProfileDataBean getAccountProfileData(String userID) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:getProfileData", userID);
+
+        return entityManager.find(AccountProfileDataBean.class, userID);
+    }
+
+    public AccountProfileDataBean updateAccountProfile(AccountProfileDataBean profileData) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:updateAccountProfileData", profileData);
+        /*
+         * // Retreive the pevious account profile in order to get account
+         * data... hook it into new object AccountProfileDataBean temp =
+         * entityManager.find(AccountProfileDataBean.class,
+         * profileData.getUserID()); // In order for the object to merge
+         * correctly, the account has to be hooked into the temp object... // -
+         * may need to reverse this and obtain the full object first
+         * 
+         * profileData.setAccount(temp.getAccount());
+         * 
+         * //TODO this might not be correct temp =
+         * 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());
+
+        entityManager.merge(temp);
+
+        return temp;
+    }
+
+    public AccountDataBean login(String userID, String password) throws RollbackException {
+        AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+
+        if (profile == null) {
+            throw new EJBException("No such user: " + userID);
+        }
+        entityManager.merge(profile);
+        AccountDataBean account = profile.getAccount();
+
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:login", userID, password);
+        account.login(password);
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:login(" + userID + "," + password + ") success" + account);
+
+        return account;
+    }
+
+    public void logout(String userID) {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:logout", userID);
+
+        AccountProfileDataBean profile = entityManager.find(AccountProfileDataBean.class, userID);
+        AccountDataBean account = profile.getAccount();
+
+        account.logout();
+        
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:logout(" + userID + ") success");
+    }
+
+    public AccountDataBean register(String userID, String password, String fullname, String address, String email, String creditcard, BigDecimal openBalance) {
+        AccountDataBean account = null;
+        AccountProfileDataBean profile = null;
+        
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:register", userID, password, fullname, address, email, creditcard, openBalance);
+
+        // Check to see if a profile with the desired userID already exists
+        profile = entityManager.find(AccountProfileDataBean.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, address, email, creditcard);
+            account = new AccountDataBean(0, 0, null, new Timestamp(System.currentTimeMillis()), openBalance, openBalance, userID);
+
+            profile.setAccount(account);
+            account.setProfile(profile);
+
+            entityManager.persist(profile); 
+            entityManager.persist(account);
+        }
+        
+        return account;
+    }
+
+    @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+    public RunStatsDataBean resetTrade(boolean deleteAll) throws Exception {
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:resetTrade", deleteAll);
+
+        return new org.apache.geronimo.samples.daytrader.direct.TradeJEEDirect(false).resetTrade(deleteAll);
+    }
+
+    private void publishQuotePriceChange(QuoteDataBean quote, BigDecimal oldPrice, BigDecimal changeFactor, double sharesTraded) {
+        if (!TradeConfig.getPublishQuotePriceChange())
+            return;
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:publishQuotePricePublishing -- quoteData = " + quote);
+
+        Connection conn = null;
+        Session sess = null;
+
+        try {
+            conn = topicConnectionFactory.createConnection();
+            sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            MessageProducer msgProducer = sess.createProducer(tradeStreamerTopic);
+            TextMessage message = sess.createTextMessage();
+
+            String command = "updateQuote";
+            message.setStringProperty("command", command);
+            message.setStringProperty("symbol", quote.getSymbol());
+            message.setStringProperty("company", quote.getCompanyName());
+            message.setStringProperty("price", quote.getPrice().toString());
+            message.setStringProperty("oldPrice", oldPrice.toString());
+            message.setStringProperty("open", quote.getOpen().toString());
+            message.setStringProperty("low", quote.getLow().toString());
+            message.setStringProperty("high", quote.getHigh().toString());
+            message.setDoubleProperty("volume", quote.getVolume());
+
+            message.setStringProperty("changeFactor", changeFactor.toString());
+            message.setDoubleProperty("sharesTraded", sharesTraded);
+            message.setLongProperty("publishTime", System.currentTimeMillis());
+            message.setText("Update Stock price for " + quote.getSymbol() + " old price = " + oldPrice + " new price = " + quote.getPrice());
+
+            msgProducer.send(message);
+        } catch (Exception e) {
+            throw new EJBException(e.getMessage(), e); // pass the exception back
+        } finally {
+            try {
+                if (conn != null)
+                    conn.close();
+                if (sess != null)
+                    sess.close();
+            } catch (javax.jms.JMSException e) {
+                throw new EJBException(e.getMessage(), e); // pass the exception back
+            }
+        }
+    }
+
+    private OrderDataBean createOrder(AccountDataBean account, QuoteDataBean quote, HoldingDataBean holding, String orderType, double quantity) {
+
+        OrderDataBean order;
+
+        if (Log.doTrace())
+            Log.trace("TradeSLSBBean:createOrder(orderID=" 
+                    + " account=" + ((account == null) ? null : account.getAccountID()) 
+                    + " quote=" + ((quote == null) ? null : quote.getSymbol()) 
+                    + " orderType=" + orderType 
+                    + " quantity=" + quantity);
+        try {
+            order = new OrderDataBean(orderType, "open", new Timestamp(System.currentTimeMillis()), null, quantity, quote.getPrice().setScale(FinancialUtils.SCALE, FinancialUtils.ROUND), 
+                    TradeConfig.getOrderFee(orderType), account, quote, holding);
+            entityManager.persist(order);
+        } catch (Exception e) {
+            Log.error("TradeSLSBBean:createOrder -- failed to create Order", e);
+            throw new EJBException("TradeSLSBBean:createOrder -- failed to create Order", e);
+        }
+        return order;
+    }
+
+    private HoldingDataBean createHolding(AccountDataBean account, QuoteDataBean quote, double quantity, BigDecimal purchasePrice) throws Exception {
+        HoldingDataBean newHolding = new HoldingDataBean(quantity, purchasePrice, new Timestamp(System.currentTimeMillis()), account, quote);
+        entityManager.persist(newHolding);
+        return newHolding;
+    }
+    
+    public double investmentReturn(double investment, double NetValue) throws Exception {
+        if (Log.doTrace()) Log.trace("TradeSLSBBean:investmentReturn");
+    
+        double diff = NetValue - investment;
+        double ir = diff / investment;
+        return ir;
+    }
+    
+    public QuoteDataBean pingTwoPhase(String symbol) throws Exception {
+        try{
+            if (Log.doTrace()) Log.trace("TradeSLSBBean:pingTwoPhase", symbol);
+            QuoteDataBean quoteData=null;
+            Connection conn = null;
+            Session sess = null;        
+            
+            try {
+
+                //Get a Quote and send a JMS message in a 2-phase commit
+                quoteData = entityManager.find(QuoteDataBean.class, symbol);
+
+                conn = queueConnectionFactory.createConnection();                        
+                sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+                MessageProducer msgProducer = sess.createProducer(tradeBrokerQueue);
+                TextMessage message = sess.createTextMessage();
+
+                String command= "ping";
+                message.setStringProperty("command", command);
+                message.setLongProperty("publishTime", System.currentTimeMillis());         
+                message.setText("Ping message for queue java:comp/env/jms/TradeBrokerQueue sent from TradeSLSBBean:pingTwoPhase at " + new java.util.Date());
+
+                msgProducer.send(message);  
+            } 
+            catch (Exception e) {
+                Log.error("TradeSLSBBean:pingTwoPhase -- exception caught",e);
+            }
+
+            finally {
+                if (conn != null)
+                    conn.close();   
+                if (sess != null)
+                    sess.close();
+            }           
+
+            return quoteData;
+        } catch (Exception e){
+            throw new Exception(e.getMessage(),e);
+        }
+    }
+
+    class quotePriceComparator implements java.util.Comparator {
+        public int compare(Object quote1, Object quote2) {
+            double change1 = ((QuoteDataBean) quote1).getChange();
+            double change2 = ((QuoteDataBean) quote2).getChange();
+            return new Double(change2).compareTo(change1);
+        }
+    }
+
+    @PostConstruct
+    public void postConstruct() {
+        Log.trace("POST CONSTRUCT");
+        Log.trace("updateQuotePrices: " + TradeConfig.getUpdateQuotePrices());
+        Log.trace("publishQuotePriceChange: " + TradeConfig.getPublishQuotePriceChange());
+    }
+
+}

Propchange: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeJPADirect.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/daytrader/trunk/modules/ejb3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb3/pom.xml?rev=809686&r1=809685&r2=809686&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb3/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb3/pom.xml Mon Aug 31 18:48:41 2009
@@ -25,7 +25,7 @@
     </parent>
 
     <groupId>org.apache.geronimo.daytrader.modules</groupId>
-    <artifactId>ejb3</artifactId>
+    <artifactId>daytrader-ejb3</artifactId>
     <packaging>ejb</packaging>
     <name>DayTrader :: Modules - EJB3</name>
     <description>Daytrader EJB3 Module</description>
@@ -39,7 +39,17 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>daytrader-util</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-entities</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-core</artifactId>
             <version>${pom.version}</version>
         </dependency>
 <!--
@@ -95,26 +105,6 @@
             <artifactId>openjpa</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- OpenJPA enhancer depends
-        <dependency>
-            <groupId>net.sourceforge.serp</groupId>
-            <artifactId>serp</artifactId>
-            <version>1.13.1</version>
-            <scope>provided</scope>
-        </dependency> 
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
-            <scope>provided</scope>
-        </dependency>
-        -->
     </dependencies>
     <build>
         <resources>
@@ -126,6 +116,7 @@
 
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ejb-plugin</artifactId>
                 <configuration>
                     <generateClient>true</generateClient>

Modified: geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java?rev=809686&r1=809685&r2=809686&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java (original)
+++ geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java Mon Aug 31 18:48:41 2009
@@ -30,7 +30,7 @@
 import javax.jms.MessageListener;
 import javax.jms.TextMessage;
 import org.apache.geronimo.samples.daytrader.TradeServices;
-import org.apache.geronimo.samples.daytrader.direct.TradeDirect;
+import org.apache.geronimo.samples.daytrader.direct.TradeJEEDirect;
 import org.apache.geronimo.samples.daytrader.util.Log;
 import org.apache.geronimo.samples.daytrader.util.MDBStats;
 import org.apache.geronimo.samples.daytrader.util.TimerStat;
@@ -150,7 +150,7 @@
     private TradeServices getTrade(boolean direct) throws Exception{
         TradeServices trade;
         if (direct)
-            trade = new TradeDirect();
+            trade = new TradeJEEDirect();
         else
             trade = tradeSLSB;
         

Modified: geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBBean.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBBean.java?rev=809686&r1=809685&r2=809686&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBBean.java (original)
+++ geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBBean.java Mon Aug 31 18:48:41 2009
@@ -24,7 +24,7 @@
 import org.apache.geronimo.samples.daytrader.QuoteDataBean;
 import org.apache.geronimo.samples.daytrader.RunStatsDataBean;
 import org.apache.geronimo.samples.daytrader.MarketSummaryDataBean;
-import org.apache.geronimo.samples.daytrader.direct.TradeDirect;
+import org.apache.geronimo.samples.daytrader.direct.TradeJEEDirect;
 
 import java.math.BigDecimal;
 import java.util.Collection;
@@ -40,92 +40,92 @@
 	}
 
 	public MarketSummaryDataBean getMarketSummary() throws Exception {
-		return (new TradeDirect(true)).getMarketSummary();
+		return (new TradeJEEDirect(true)).getMarketSummary();
 	}
 
 
 	public OrderDataBean buy(String userID, String symbol, double quantity, int orderProcessingMode) throws Exception {
-		return (new TradeDirect(true)).buy(userID, symbol, quantity, orderProcessingMode);
+		return (new TradeJEEDirect(true)).buy(userID, symbol, quantity, orderProcessingMode);
 	}
 
 	public OrderDataBean sell(String userID, Integer holdingID, int orderProcessingMode) throws Exception {
-		return (new TradeDirect(true)).sell(userID, holdingID, orderProcessingMode);
+		return (new TradeJEEDirect(true)).sell(userID, holdingID, orderProcessingMode);
 	}
 
 	public void queueOrder(Integer orderID, boolean twoPhase) throws Exception {
-		(new TradeDirect(true)).queueOrder(orderID, twoPhase);
+		(new TradeJEEDirect(true)).queueOrder(orderID, twoPhase);
 	}
 
 	public OrderDataBean completeOrder(Integer orderID, boolean twoPhase) throws Exception {
-		return (new TradeDirect(true)).completeOrder(orderID, twoPhase);
+		return (new TradeJEEDirect(true)).completeOrder(orderID, twoPhase);
 	}
 
 	public void cancelOrder(Integer orderID, boolean twoPhase) throws Exception {
-		(new TradeDirect(true)).cancelOrder(orderID, twoPhase);
+		(new TradeJEEDirect(true)).cancelOrder(orderID, twoPhase);
 	}
 
 	public void orderCompleted(String userID, Integer orderID) throws Exception {
-		(new TradeDirect(true)).orderCompleted(userID, orderID);
+		(new TradeJEEDirect(true)).orderCompleted(userID, orderID);
 	}
 
 	public Collection getOrders(String userID) throws Exception {
-		return (new TradeDirect(true)).getOrders(userID);
+		return (new TradeJEEDirect(true)).getOrders(userID);
 	}
 
 	public Collection getClosedOrders(String userID) throws Exception {
-		return (new TradeDirect(true)).getClosedOrders(userID);
+		return (new TradeJEEDirect(true)).getClosedOrders(userID);
 	}
 
 	public QuoteDataBean createQuote(String symbol, String companyName, BigDecimal price) throws Exception {
-		return (new TradeDirect(true)).createQuote(symbol, companyName, price);
+		return (new TradeJEEDirect(true)).createQuote(symbol, companyName, price);
 	}
 
 	public QuoteDataBean getQuote(String symbol) throws Exception {
-		return (new TradeDirect(true)).getQuote(symbol);
+		return (new TradeJEEDirect(true)).getQuote(symbol);
 	}
 
 	public Collection getAllQuotes() throws Exception {
-		return (new TradeDirect(true)).getAllQuotes();
+		return (new TradeJEEDirect(true)).getAllQuotes();
 	}
 
 	public QuoteDataBean updateQuotePriceVolume(String symbol, BigDecimal newPrice, double sharesTraded) throws Exception {
-		return (new TradeDirect(true)).updateQuotePriceVolume(symbol, newPrice, sharesTraded);
+		return (new TradeJEEDirect(true)).updateQuotePriceVolume(symbol, newPrice, sharesTraded);
 	}
 
 	public Collection getHoldings(String userID) throws Exception {
-		return (new TradeDirect(true)).getHoldings(userID);
+		return (new TradeJEEDirect(true)).getHoldings(userID);
 	}
 
 	public HoldingDataBean getHolding(Integer holdingID) throws Exception {
-		return (new TradeDirect(true)).getHolding(holdingID);
+		return (new TradeJEEDirect(true)).getHolding(holdingID);
 	}
 
 	public AccountDataBean getAccountData(String userID) throws Exception {
-		return (new TradeDirect(true)).getAccountData(userID);
+		return (new TradeJEEDirect(true)).getAccountData(userID);
 	}
 
 	public AccountProfileDataBean getAccountProfileData(String userID) throws Exception {
-		return (new TradeDirect(true)).getAccountProfileData(userID);
+		return (new TradeJEEDirect(true)).getAccountProfileData(userID);
 	}
 
 	public AccountProfileDataBean updateAccountProfile(AccountProfileDataBean profileData) throws Exception {
-		return (new TradeDirect(true)).updateAccountProfile(profileData);
+		return (new TradeJEEDirect(true)).updateAccountProfile(profileData);
 	}
 
 	public AccountDataBean login(String userID, String password) throws Exception {
-		return (new TradeDirect(true)).login(userID, password);
+		return (new TradeJEEDirect(true)).login(userID, password);
 	}
 
 	public void logout(String userID) throws Exception {
-		(new TradeDirect(true)).logout(userID);
+		(new TradeJEEDirect(true)).logout(userID);
 	}
 
 	public AccountDataBean register(String userID, String password, String fullname, String address, String email, String creditcard, BigDecimal openBalance) throws Exception {
-		return (new TradeDirect(true)).register(userID, password, fullname, address, email, creditcard, openBalance);
+		return (new TradeJEEDirect(true)).register(userID, password, fullname, address, email, creditcard, openBalance);
 	}
 
     @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
 	public RunStatsDataBean resetTrade(boolean deleteAll) throws Exception {
-		return (new TradeDirect(false)).resetTrade(deleteAll);
+		return (new TradeJEEDirect(false)).resetTrade(deleteAll);
 	}
 }

Modified: geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java?rev=809686&r1=809685&r2=809686&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java (original)
+++ geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java Mon Aug 31 18:48:41 2009
@@ -19,13 +19,17 @@
 
 import org.apache.geronimo.samples.daytrader.AccountDataBean;
 import org.apache.geronimo.samples.daytrader.AccountProfileDataBean;
+import org.apache.geronimo.samples.daytrader.FinancialUtils;
 import org.apache.geronimo.samples.daytrader.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.MarketSummaryDataBean;
 import org.apache.geronimo.samples.daytrader.OrderDataBean;
 import org.apache.geronimo.samples.daytrader.QuoteDataBean;
-import org.apache.geronimo.samples.daytrader.TradeConfig;
-import org.apache.geronimo.samples.daytrader.TradeAction;
 import org.apache.geronimo.samples.daytrader.RunStatsDataBean;
-import org.apache.geronimo.samples.daytrader.MarketSummaryDataBean;
+import org.apache.geronimo.samples.daytrader.TradeAction;
+import org.apache.geronimo.samples.daytrader.util.Log;
+import org.apache.geronimo.samples.daytrader.util.MDBStats;
+import org.apache.geronimo.samples.daytrader.util.TradeConfig;
+
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -33,6 +37,7 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
+
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.ejb.*;
@@ -48,9 +53,6 @@
 import javax.transaction.NotSupportedException;
 import javax.transaction.RollbackException;
 import javax.transaction.SystemException;
-import org.apache.geronimo.samples.daytrader.util.FinancialUtils;
-import org.apache.geronimo.samples.daytrader.util.Log;
-import org.apache.geronimo.samples.daytrader.util.MDBStats;
 
 @Stateless
 @TransactionAttribute(TransactionAttributeType.REQUIRED)
@@ -612,7 +614,7 @@
         if (Log.doTrace())
             Log.trace("TradeSLSBBean:resetTrade", deleteAll);
 
-        return new org.apache.geronimo.samples.daytrader.direct.TradeDirect(false).resetTrade(deleteAll);
+        return new org.apache.geronimo.samples.daytrader.direct.TradeJEEDirect(false).resetTrade(deleteAll);
     }
 
     private void publishQuotePriceChange(QuoteDataBean quote, BigDecimal oldPrice, BigDecimal changeFactor, double sharesTraded) {

Added: geronimo/daytrader/trunk/modules/entities/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/entities/pom.xml?rev=809686&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/entities/pom.xml (added)
+++ geronimo/daytrader/trunk/modules/entities/pom.xml Mon Aug 31 18:48:41 2009
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.daytrader.modules</groupId>
+    <artifactId>daytrader-entities</artifactId>
+    <packaging>jar</packaging>
+    <name>DayTrader :: Modules - Entities</name>
+    <description>Daytrader JPA Enhanced Enttities Module</description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/entities</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/entities</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/entities</url>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-util</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>    
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+    	    <groupId>org.apache.geronimo.specs</groupId>
+    	    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    	    <scope>provided</scope>
+	</dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- OpenJPA PCEnhancer depends -->
+        <dependency>
+            <groupId>net.sourceforge.serp</groupId>
+            <artifactId>serp</artifactId>
+            <version>1.13.1</version>
+            <scope>provided</scope>
+        </dependency> 
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- end OpenJPA PCEnhancer depends -->
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <tasks>
+                                <path id="enhance.path.ref">
+                                    <fileset dir="${project.build.outputDirectory}">
+                                        <include name="*Bean*/*.class"/>
+                                    </fileset>
+                                </path>
+                                <pathconvert property="enhance.files"
+                                             refid="enhance.path.ref"
+                                             pathsep=" "/>
+                                <java classname="org.apache.openjpa.enhance.PCEnhancer">
+                                    <arg line="-p persistence.xml"/>
+                                    <arg line="${enhance.files}"/>
+                                    <classpath>
+                                        <path refid="maven.dependency.classpath"/>
+                                        <path refid="maven.compile.classpath"/>
+                                    </classpath>
+                                </java>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

Added: geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java?rev=809686&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java (added)
+++ geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java Mon Aug 31 18:48:41 2009
@@ -0,0 +1,301 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.samples.daytrader;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.Date;
+import javax.ejb.EJBException;
+
+import javax.persistence.*;
+
+import org.apache.geronimo.samples.daytrader.util.Log;
+import org.apache.geronimo.samples.daytrader.util.TradeConfig;
+
+@Entity(name = "accountejb")
+@Table(name = "accountejb")
+@NamedQueries( {
+        @NamedQuery(name = "accountejb.findByCreationdate", query = "SELECT a FROM accountejb a WHERE a.creationDate = :creationdate"),
+        @NamedQuery(name = "accountejb.findByOpenbalance", query = "SELECT a FROM accountejb a WHERE a.openBalance = :openbalance"),
+        @NamedQuery(name = "accountejb.findByLogoutcount", query = "SELECT a FROM accountejb a WHERE a.logoutCount = :logoutcount"),
+        @NamedQuery(name = "accountejb.findByBalance", query = "SELECT a FROM accountejb a WHERE a.balance = :balance"),
+        @NamedQuery(name = "accountejb.findByAccountid", query = "SELECT a FROM accountejb a WHERE a.accountID = :accountid"),
+        @NamedQuery(name = "accountejb.findByAccountid_eager", query = "SELECT a FROM accountejb a LEFT JOIN FETCH a.profile WHERE a.accountID = :accountid"),
+        @NamedQuery(name = "accountejb.findByAccountid_eagerholdings", query = "SELECT a FROM accountejb a LEFT JOIN FETCH a.holdings WHERE a.accountID = :accountid"),
+        @NamedQuery(name = "accountejb.findByLastlogin", query = "SELECT a FROM accountejb a WHERE a.lastLogin = :lastlogin"),
+        @NamedQuery(name = "accountejb.findByLogincount", query = "SELECT a FROM accountejb a WHERE a.loginCount = :logincount")
+    })
+public class AccountDataBean implements Serializable {
+
+    /* Accessor methods for persistent fields */
+    @TableGenerator(
+            name="accountIdGen",
+            table="KEYGENEJB",
+            pkColumnName="KEYNAME",
+            valueColumnName="KEYVAL",
+            pkColumnValue="account",
+            allocationSize=1000)
+    @Id
+    @GeneratedValue(strategy=GenerationType.TABLE, generator="accountIdGen")
+    @Column(name = "ACCOUNTID", nullable = false)
+    private Integer accountID;              /* accountID */
+    
+    @Column(name = "LOGINCOUNT", nullable = false)
+    private int loginCount;                 /* loginCount */
+    
+    @Column(name = "LOGOUTCOUNT", nullable = false)
+    private int logoutCount;                /* logoutCount */
+    
+    @Column(name = "LASTLOGIN")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date lastLogin;                 /* lastLogin Date */
+    
+    @Column(name = "CREATIONDATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date creationDate;              /* creationDate */
+    
+    @Column(name = "BALANCE")
+    private BigDecimal balance;             /* balance */
+    
+    @Column(name = "OPENBALANCE")
+    private BigDecimal openBalance;         /* open balance */
+    
+    @OneToMany(mappedBy = "account", fetch=FetchType.LAZY)
+    private Collection<OrderDataBean> orders;
+    
+    @OneToMany(mappedBy = "account", fetch=FetchType.LAZY)
+    private Collection<HoldingDataBean> holdings;
+    
+    @OneToOne(fetch=FetchType.LAZY)
+    @JoinColumn(name="PROFILE_USERID")
+    private AccountProfileDataBean profile;
+
+//    @Version
+//    private Integer optLock;
+
+    /* Accessor methods for relationship fields are only included for the AccountProfile profileID */
+    @Transient
+    private String profileID;
+
+    public AccountDataBean() {
+    }
+
+    public AccountDataBean(Integer accountID,
+            int loginCount,
+            int logoutCount,
+            Date lastLogin,
+            Date creationDate,
+            BigDecimal balance,
+            BigDecimal openBalance,
+            String profileID) {
+        setAccountID(accountID);
+        setLoginCount(loginCount);
+        setLogoutCount(logoutCount);
+        setLastLogin(lastLogin);
+        setCreationDate(creationDate);
+        setBalance(balance);
+        setOpenBalance(openBalance);
+        setProfileID(profileID);
+    }
+
+    public AccountDataBean(int loginCount,
+            int logoutCount,
+            Date lastLogin,
+            Date creationDate,
+            BigDecimal balance,
+            BigDecimal openBalance,
+            String profileID) {
+        setLoginCount(loginCount);
+        setLogoutCount(logoutCount);
+        setLastLogin(lastLogin);
+        setCreationDate(creationDate);
+        setBalance(balance);
+        setOpenBalance(openBalance);
+        setProfileID(profileID);
+    }
+
+    public static AccountDataBean getRandomInstance() {
+        return new AccountDataBean(new Integer(TradeConfig.rndInt(100000)), //accountID
+                TradeConfig.rndInt(10000), //loginCount
+                TradeConfig.rndInt(10000), //logoutCount
+                new java.util.Date(), //lastLogin
+                new java.util.Date(TradeConfig.rndInt(Integer.MAX_VALUE)), //creationDate
+                TradeConfig.rndBigDecimal(1000000.0f), //balance
+                TradeConfig.rndBigDecimal(1000000.0f), //openBalance
+                TradeConfig.rndUserID() //profileID
+        );
+    }
+
+    public String toString() {
+        return "\n\tAccount Data for account: " + getAccountID()
+                + "\n\t\t   loginCount:" + getLoginCount()
+                + "\n\t\t  logoutCount:" + getLogoutCount()
+                + "\n\t\t    lastLogin:" + getLastLogin()
+                + "\n\t\t creationDate:" + getCreationDate()
+                + "\n\t\t      balance:" + getBalance()
+                + "\n\t\t  openBalance:" + getOpenBalance()
+                + "\n\t\t    profileID:" + getProfileID()
+                ;
+    }
+
+    public String toHTML() {
+        return "<BR>Account Data for account: <B>" + getAccountID() + "</B>"
+                + "<LI>   loginCount:" + getLoginCount() + "</LI>"
+                + "<LI>  logoutCount:" + getLogoutCount() + "</LI>"
+                + "<LI>    lastLogin:" + getLastLogin() + "</LI>"
+                + "<LI> creationDate:" + getCreationDate() + "</LI>"
+                + "<LI>      balance:" + getBalance() + "</LI>"
+                + "<LI>  openBalance:" + getOpenBalance() + "</LI>"
+                + "<LI>    profileID:" + getProfileID() + "</LI>"
+                ;
+    }
+
+    public void print() {
+        Log.log(this.toString());
+    }
+
+    public Integer getAccountID() {
+        return accountID;
+    }
+
+    public void setAccountID(Integer accountID) {
+        this.accountID = accountID;
+    }
+
+    public int getLoginCount() {
+        return loginCount;
+    }
+
+    public void setLoginCount(int loginCount) {
+        this.loginCount = loginCount;
+    }
+
+    public int getLogoutCount() {
+        return logoutCount;
+    }
+
+    public void setLogoutCount(int logoutCount) {
+        this.logoutCount = logoutCount;
+    }
+
+    public Date getLastLogin() {
+        return lastLogin;
+    }
+
+    public void setLastLogin(Date lastLogin) {
+        this.lastLogin = lastLogin;
+    }
+
+    public Date getCreationDate() {
+        return creationDate;
+    }
+
+    public void setCreationDate(Date creationDate) {
+        this.creationDate = creationDate;
+    }
+
+    public BigDecimal getBalance() {
+        return balance;
+    }
+
+    public void setBalance(BigDecimal balance) {
+        this.balance = balance;
+    }
+
+    public BigDecimal getOpenBalance() {
+        return openBalance;
+    }
+
+    public void setOpenBalance(BigDecimal openBalance) {
+        this.openBalance = openBalance;
+    }
+
+    public String getProfileID() {
+        return profileID;
+    }
+
+    public void setProfileID(String profileID) {
+        this.profileID = profileID;
+    }
+
+    /* Disabled for D185273
+     public String getUserID() {
+         return getProfileID();
+     }
+     */
+
+    public Collection<OrderDataBean> getOrders() {
+        return orders;
+    }
+
+    public void setOrders(Collection<OrderDataBean> orders) {
+        this.orders = orders;
+    }
+    
+    public Collection<HoldingDataBean> getHoldings() {
+        return holdings;
+    }
+
+    public void setHoldings(Collection<HoldingDataBean> holdings) {
+        this.holdings = holdings;
+    }
+
+    public AccountProfileDataBean getProfile() {
+        return profile;
+    }
+
+    public void setProfile(AccountProfileDataBean profile) {
+        this.profile = profile;
+    }
+
+    public void login(String password) {
+        AccountProfileDataBean profile = getProfile();
+        if ((profile == null) || (profile.getPassword().equals(password) == false)) {
+            String error = "AccountBean:Login failure for account: " + getAccountID() +
+                    ((profile == null) ? "null AccountProfile" :
+                            "\n\tIncorrect password-->" + profile.getUserID() + ":" + profile.getPassword());
+            throw new EJBException(error);
+        }
+
+        setLastLogin(new Timestamp(System.currentTimeMillis()));
+        setLoginCount(getLoginCount() + 1);
+    }
+
+    public void logout() {
+        setLogoutCount(getLogoutCount() + 1);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (this.accountID != null ? this.accountID.hashCode() : 0);
+        return hash;
+    }
+
+    @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 AccountDataBean)) {
+            return false;
+        }
+        AccountDataBean other = (AccountDataBean)object;
+        if (this.accountID != other.accountID && (this.accountID == null || !this.accountID.equals(other.accountID))) return false;
+        return true;
+    }
+}

Propchange: geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java?rev=809686&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java (added)
+++ geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java Mon Aug 31 18:48:41 2009
@@ -0,0 +1,188 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.samples.daytrader;
+
+import javax.persistence.*;
+
+import org.apache.geronimo.samples.daytrader.util.Log;
+import org.apache.geronimo.samples.daytrader.util.TradeConfig;
+
+@Entity(name = "accountprofileejb")
+@Table(name = "accountprofileejb")
+@NamedQueries( {
+        @NamedQuery(name = "accountprofileejb.findByAddress", query = "SELECT a FROM accountprofileejb a WHERE a.address = :address"),
+        @NamedQuery(name = "accountprofileejb.findByPasswd", query = "SELECT a FROM accountprofileejb a WHERE a.passwd = :passwd"),
+        @NamedQuery(name = "accountprofileejb.findByUserid", query = "SELECT a FROM accountprofileejb a WHERE a.userID = :userid"),
+        @NamedQuery(name = "accountprofileejb.findByEmail", query = "SELECT a FROM accountprofileejb a WHERE a.email = :email"),
+        @NamedQuery(name = "accountprofileejb.findByCreditcard", query = "SELECT a FROM accountprofileejb a WHERE a.creditCard = :creditcard"),
+        @NamedQuery(name = "accountprofileejb.findByFullname", query = "SELECT a FROM accountprofileejb a WHERE a.fullName = :fullname")
+    })
+public class AccountProfileDataBean implements java.io.Serializable {
+
+    /* Accessor methods for persistent fields */
+
+    @Id
+    @Column(name = "USERID", nullable = false)
+    private String userID;              /* userID */
+    
+    @Column(name = "PASSWD")
+    private String passwd;              /* password */
+    
+    @Column(name = "FULLNAME")
+    private String fullName;            /* fullName */
+    
+    @Column(name = "ADDRESS")
+    private String address;             /* address */
+    
+    @Column(name = "EMAIL")
+    private String email;               /* email */
+    
+    @Column(name = "CREDITCARD")
+    private String creditCard;          /* creditCard */
+    
+    @OneToOne(mappedBy="profile", fetch=FetchType.LAZY)
+    private AccountDataBean account;
+
+//    @Version
+//    private Integer optLock;
+
+    public AccountProfileDataBean() {
+    }
+
+    public AccountProfileDataBean(String userID,
+            String password,
+            String fullName,
+            String address,
+            String email,
+            String creditCard) {
+        setUserID(userID);
+        setPassword(password);
+        setFullName(fullName);
+        setAddress(address);
+        setEmail(email);
+        setCreditCard(creditCard);
+    }
+
+    public static AccountProfileDataBean getRandomInstance() {
+        return new AccountProfileDataBean(
+                TradeConfig.rndUserID(),                        // userID
+                TradeConfig.rndUserID(),                        // passwd
+                TradeConfig.rndFullName(),                      // fullname
+                TradeConfig.rndAddress(),                       // address
+                TradeConfig.rndEmail(TradeConfig.rndUserID()),  //email
+                TradeConfig.rndCreditCard()                     // creditCard
+        );
+    }
+
+    public String toString() {
+        return "\n\tAccount Profile Data for userID:" + getUserID()
+                + "\n\t\t   passwd:" + getPassword()
+                + "\n\t\t   fullName:" + getFullName()
+                + "\n\t\t    address:" + getAddress()
+                + "\n\t\t      email:" + getEmail()
+                + "\n\t\t creditCard:" + getCreditCard()
+                ;
+    }
+
+    public String toHTML() {
+        return "<BR>Account Profile Data for userID: <B>" + getUserID() + "</B>"
+                + "<LI>   passwd:" + getPassword() + "</LI>"
+                + "<LI>   fullName:" + getFullName() + "</LI>"
+                + "<LI>    address:" + getAddress() + "</LI>"
+                + "<LI>      email:" + getEmail() + "</LI>"
+                + "<LI> creditCard:" + getCreditCard() + "</LI>"
+                ;
+    }
+
+    public void print() {
+        Log.log(this.toString());
+    }
+
+    public String getUserID() {
+        return userID;
+    }
+
+    public void setUserID(String userID) {
+        this.userID = userID;
+    }
+
+    public String getPassword() {
+        return passwd;
+    }
+
+    public void setPassword(String password) {
+        this.passwd = password;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getCreditCard() {
+        return creditCard;
+    }
+
+    public void setCreditCard(String creditCard) {
+        this.creditCard = creditCard;
+    }
+
+    public AccountDataBean getAccount() {
+        return account;
+    }
+
+    public void setAccount(AccountDataBean account) {
+        this.account = account;
+    }
+    
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (this.userID != null ? this.userID.hashCode() : 0);
+        return hash;
+    }
+
+    @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 AccountProfileDataBean)) {
+            return false;
+        }
+        AccountProfileDataBean other = (AccountProfileDataBean)object;
+        if (this.userID != other.userID && (this.userID == null || !this.userID.equals(other.userID))) return false;
+        return true;
+    }
+}

Propchange: geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java?rev=809686&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java (added)
+++ geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java Mon Aug 31 18:48:41 2009
@@ -0,0 +1,218 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.samples.daytrader;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.*;
+
+import org.apache.geronimo.samples.daytrader.util.Log;
+import org.apache.geronimo.samples.daytrader.util.TradeConfig;
+
+@Entity(name = "holdingejb")
+@Table(name = "holdingejb")
+@NamedQueries( {
+        @NamedQuery(name = "holdingejb.findByPurchaseprice", query = "SELECT h FROM holdingejb h WHERE h.purchasePrice = :purchaseprice"),
+        @NamedQuery(name = "holdingejb.findByHoldingid", query = "SELECT h FROM holdingejb h WHERE h.holdingID = :holdingid"),
+        @NamedQuery(name = "holdingejb.findByQuantity", query = "SELECT h FROM holdingejb h WHERE h.quantity = :quantity"),
+        @NamedQuery(name = "holdingejb.findByPurchasedate", query = "SELECT h FROM holdingejb h WHERE h.purchaseDate = :purchasedate"),
+        @NamedQuery(name = "holdingejb.holdingsByUserID", query = "SELECT h FROM holdingejb h where h.account.profile.userID = :userID")
+    })
+public class HoldingDataBean implements Serializable {
+
+    /* persistent/relationship fields */
+
+    @TableGenerator(
+            name="holdingIdGen",
+            table="KEYGENEJB",
+            pkColumnName="KEYNAME",
+            valueColumnName="KEYVAL",
+            pkColumnValue="holding",
+            allocationSize=1000)
+    @Id
+    @GeneratedValue(strategy=GenerationType.TABLE, generator="holdingIdGen")
+    @Column(name = "HOLDINGID", nullable = false)
+    private Integer holdingID;              /* holdingID */
+    
+    @Column(name = "QUANTITY", nullable = false)
+    private double quantity;                /* quantity */
+    
+    @Column(name = "PURCHASEPRICE")
+    private BigDecimal purchasePrice;       /* purchasePrice */
+    
+    @Column(name = "PURCHASEDATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date purchaseDate;              /* purchaseDate */
+    
+    @Transient
+    private String quoteID;                 /* Holding(*)  ---> Quote(1) */
+    
+    @ManyToOne(fetch=FetchType.LAZY)
+    @JoinColumn(name="ACCOUNT_ACCOUNTID")
+    private AccountDataBean account;
+    
+    @ManyToOne(fetch=FetchType.EAGER)
+    @JoinColumn(name = "QUOTE_SYMBOL")
+    private QuoteDataBean quote;
+
+//    @Version
+//    private Integer optLock;
+
+    public HoldingDataBean() {
+    }
+
+    public HoldingDataBean(Integer holdingID,
+            double quantity,
+            BigDecimal purchasePrice,
+            Date purchaseDate,
+            String quoteID) {
+        setHoldingID(holdingID);
+        setQuantity(quantity);
+        setPurchasePrice(purchasePrice);
+        setPurchaseDate(purchaseDate);
+        setQuoteID(quoteID);
+    }
+
+    public HoldingDataBean(double quantity,
+            BigDecimal purchasePrice,
+            Date purchaseDate,
+            AccountDataBean account,
+            QuoteDataBean quote) {
+        setQuantity(quantity);
+        setPurchasePrice(purchasePrice);
+        setPurchaseDate(purchaseDate);
+        setAccount(account);
+        setQuote(quote);
+    }
+
+    public static HoldingDataBean getRandomInstance() {
+        return new HoldingDataBean(
+                new Integer(TradeConfig.rndInt(100000)),     //holdingID
+                TradeConfig.rndQuantity(),                     //quantity
+                TradeConfig.rndBigDecimal(1000.0f),             //purchasePrice
+                new java.util.Date(TradeConfig.rndInt(Integer.MAX_VALUE)), //purchaseDate
+                TradeConfig.rndSymbol()                        // symbol
+        );
+    }
+
+    public String toString() {
+        return "\n\tHolding Data for holding: " + getHoldingID()
+                + "\n\t\t      quantity:" + getQuantity()
+                + "\n\t\t purchasePrice:" + getPurchasePrice()
+                + "\n\t\t  purchaseDate:" + getPurchaseDate()
+                + "\n\t\t       quoteID:" + getQuoteID()
+                ;
+    }
+
+    public String toHTML() {
+        return "<BR>Holding Data for holding: " + getHoldingID() + "</B>"
+                + "<LI>      quantity:" + getQuantity() + "</LI>"
+                + "<LI> purchasePrice:" + getPurchasePrice() + "</LI>"
+                + "<LI>  purchaseDate:" + getPurchaseDate() + "</LI>"
+                + "<LI>       quoteID:" + getQuoteID() + "</LI>"
+                ;
+    }
+
+    public void print() {
+        Log.log(this.toString());
+    }
+
+    public Integer getHoldingID() {
+        return holdingID;
+    }
+
+    public void setHoldingID(Integer holdingID) {
+        this.holdingID = holdingID;
+    }
+
+    public double getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(double quantity) {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getPurchasePrice() {
+        return purchasePrice;
+    }
+
+    public void setPurchasePrice(BigDecimal purchasePrice) {
+        this.purchasePrice = purchasePrice;
+    }
+
+    public Date getPurchaseDate() {
+        return purchaseDate;
+    }
+
+    public void setPurchaseDate(Date purchaseDate) {
+        this.purchaseDate = purchaseDate;
+    }
+
+    public String getQuoteID() {
+        if (quote != null) {
+            return quote.getSymbol();
+        }
+        return quoteID;
+    }
+
+    public void setQuoteID(String quoteID) {
+        this.quoteID = quoteID;
+    }
+
+    public AccountDataBean getAccount() {
+        return account;
+    }
+
+    public void setAccount(AccountDataBean account) {
+        this.account = account;
+    }
+
+    /* Disabled for D185273
+     public String getSymbol() {
+         return getQuoteID();
+     }
+     */
+    
+    public QuoteDataBean getQuote() {
+        return quote;
+    }
+
+    public void setQuote(QuoteDataBean quote) {
+        this.quote = quote;
+    }
+    
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (this.holdingID != null ? this.holdingID.hashCode() : 0);
+        return hash;
+    }
+
+    @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 HoldingDataBean)) {
+            return false;
+        }
+        HoldingDataBean other = (HoldingDataBean) object;
+        if (this.holdingID != other.holdingID && (this.holdingID == null || !this.holdingID.equals(other.holdingID))) return false;
+        return true;
+    }
+}

Propchange: geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message