You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/04/01 15:46:35 UTC

svn commit: r929972 - in /incubator/aries/trunk/samples/ariestrader-sample/modules: ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/ ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/ ariestrader-...

Author: jbohn
Date: Thu Apr  1 13:46:34 2010
New Revision: 929972

URL: http://svn.apache.org/viewvc?rev=929972&view=rev
Log:
ARIES-186 cleanup some things

Modified:
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeDBManager.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServices.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServicesManager.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/RunStatsDataBean.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountDataBeanImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountProfileDataBeanImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/HoldingDataBeanImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/QuoteDataBeanImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeServicesManagerImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/KeySequenceDirect.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/am/TradeJpaAm.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/cm/TradeJpaCm.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/FinancialUtils.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/OrdersAlertFilter.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeAppServlet.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeServletAction.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Include.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2JNDI.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession1.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession2.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3.java
    incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3Object.java

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeDBManager.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeDBManager.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeDBManager.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeDBManager.java Thu Apr  1 13:46:34 2010
@@ -20,7 +20,7 @@ import org.apache.aries.samples.ariestra
 
 /**
   * TradeDBManager interface centralizes and simplifies the DB
-  * configuartion methods that are shared by some TradeServices
+  * configuration methods that are shared by some TradeServices
   * implementations.
   *
   */ 

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServices.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServices.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServices.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServices.java Thu Apr  1 13:46:34 2010
@@ -195,7 +195,7 @@ public interface TradeServices extends R
 	public Collection getHoldings(String userID) throws Exception, RemoteException;
 
    /**
-	 * Return a specific user stock holding identifed by the holdingID
+	 * Return a specific user stock holding identified by the holdingID
 	 *
 	 * @param holdingID the holdingID to return	 
 	 * @return a HoldingDataBean describing the holding

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServicesManager.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServicesManager.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServicesManager.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServicesManager.java Thu Apr  1 13:46:34 2010
@@ -48,9 +48,9 @@ public interface TradeServicesManager {
 
     /**
       * Compute and return a snapshot of the current market
-      * conditions.  This includes the TSIA - and index of the prive
-      * of the top 100 Trade stock quotes.  Ths openTSIA(the index
-      * at the open), The volune of shares traded, Top Stocks gain
+      * conditions.  This includes the TSIA - and index of the 
+      * of the top 100 Trade stock quotes.  The openTSIA(the index
+      * at the open), The volume of shares traded, Top Stocks gain
       * and loss.
       * 
       * This is a special version of this function which will cache

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java Thu Apr  1 13:46:34 2010
@@ -59,26 +59,6 @@ public class MarketSummaryDataBean imple
 		
 	}
 	
-//	public static MarketSummaryDataBean getRandomInstance() {
-//		Collection gain = new ArrayList();
-//		Collection lose = new ArrayList();
-//		
-//		for (int ii = 0; ii < 5; ii++) {
-//			QuoteDataBean quote1 = QuoteDataBean.getRandomInstance();
-//			QuoteDataBean quote2 = QuoteDataBean.getRandomInstance();
-//			
-//			gain.add(quote1);
-//			lose.add(quote2);
-//		}
-//		
-//		return new MarketSummaryDataBean(
-//			TradeConfig.rndBigDecimal(1000000.0f),
-//			TradeConfig.rndBigDecimal(1000000.0f),
-//			TradeConfig.rndQuantity(),
-//			gain,
-//			lose
-//		);
-//	}
 
 	public String toString()
 	{

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/RunStatsDataBean.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/RunStatsDataBean.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/RunStatsDataBean.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/RunStatsDataBean.java Thu Apr  1 13:46:34 2010
@@ -46,7 +46,7 @@ public class RunStatsDataBean implements
 	private int buyOrderCount;
 	// count of sell orders of trade users			
 	private int sellOrderCount;
-	// count of cancelled orders of trade users			
+	// count of canceled orders of trade users			
 	private int cancelledOrderCount;
 	// count of open orders of trade users			
 	private int openOrderCount;

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountDataBeanImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountDataBeanImpl.java Thu Apr  1 13:46:34 2010
@@ -61,8 +61,6 @@ public class AccountDataBeanImpl impleme
     
     private AccountProfileDataBean profile;
 
-//    @Version
-//    private Integer optLock;
 
     /* Accessor methods for relationship fields are only included for the AccountProfile profileID */
     
@@ -209,12 +207,6 @@ public class AccountDataBeanImpl impleme
         this.profileID = profileID;
     }
 
-    /* Disabled for D185273
-     public String getUserID() {
-         return getProfileID();
-     }
-     */
-
     public Collection<OrderDataBean> getOrders() {
         return orders;
     }

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountProfileDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountProfileDataBeanImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountProfileDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountProfileDataBeanImpl.java Thu Apr  1 13:46:34 2010
@@ -45,9 +45,6 @@ public class AccountProfileDataBeanImpl 
     
     private AccountDataBean account;
 
-//    @Version
-//    private Integer optLock;
-
     public AccountProfileDataBeanImpl() {
     }
 

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/HoldingDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/HoldingDataBeanImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/HoldingDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/HoldingDataBeanImpl.java Thu Apr  1 13:46:34 2010
@@ -52,9 +52,6 @@ public class HoldingDataBeanImpl impleme
     
     private QuoteDataBean quote;
 
-//    @Version
-//    private Integer optLock;
-
     public HoldingDataBeanImpl() {
     }
 
@@ -164,12 +161,6 @@ public class HoldingDataBeanImpl impleme
     public void setAccount(AccountDataBean account) {
         this.account = account;
     }
-
-    /* Disabled for D185273
-     public String getSymbol() {
-         return getQuoteID();
-     }
-     */
     
     public QuoteDataBean getQuote() {
         return quote;

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/QuoteDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/QuoteDataBeanImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/QuoteDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/QuoteDataBeanImpl.java Thu Apr  1 13:46:34 2010
@@ -18,8 +18,6 @@ package org.apache.aries.samples.ariestr
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Collection;
-
 import org.apache.aries.samples.ariestrader.util.Log;
 import org.apache.aries.samples.ariestrader.util.TradeConfig;
 import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean;

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java Thu Apr  1 13:46:34 2010
@@ -16,8 +16,6 @@
  */
 package org.apache.aries.samples.ariestrader.core;
 
-import javax.naming.InitialContext;
-
 import javax.sql.DataSource;
 
 import org.apache.aries.samples.ariestrader.api.persistence.RunStatsDataBean;
@@ -37,7 +35,7 @@ import java.sql.Statement;
 
 /**
  * TradeDBManagerImpl centralizes and simplifies the DB
- * configuartion methods that are shared by some TradeServices
+ * configuration methods that are shared by some TradeServices
  * implementations.
  * 
  * @see
@@ -48,8 +46,6 @@ public class TradeDBManagerImpl implemen
 
     private DataSource dataSource = null;
 
-    private static InitialContext context;
-
     private static boolean initialized = false;
 
     private static int connCount = 0;
@@ -207,23 +203,23 @@ public class TradeDBManagerImpl implemen
             }
 
             stmt = getStatement(conn, "delete from holdingejb where holdingejb.account_accountid is null");
-            int x = stmt.executeUpdate();
+            stmt.executeUpdate();
             stmt.close();
 
             // Count and Delete newly registered users (users w/ id that start
             // "ru:%":
             stmt = getStatement(conn, "delete from accountprofileejb where userid like 'ru:%'");
-            int rowCount = stmt.executeUpdate();
+            stmt.executeUpdate();
             stmt.close();
 
             stmt = getStatement(conn,
                                 "delete from orderejb where account_accountid in (select accountid from accountejb a where a.profile_userid like 'ru:%')");
-            rowCount = stmt.executeUpdate();
+            stmt.executeUpdate();
             stmt.close();
 
             stmt = getStatement(conn,
                                 "delete from holdingejb where account_accountid in (select accountid from accountejb a where a.profile_userid like 'ru:%')");
-            rowCount = stmt.executeUpdate();
+            stmt.executeUpdate();
             stmt.close();
 
             stmt = getStatement(conn, "delete from accountejb where profile_userid like 'ru:%'");
@@ -266,7 +262,7 @@ public class TradeDBManagerImpl implemen
 
             stmt =
             getStatement(conn, "update accountejb set logoutCount=0,loginCount=0 where profile_userID like 'uid:%'");
-            rowCount = stmt.executeUpdate();
+            stmt.executeUpdate();
             stmt.close();
 
             // count holdings for trade users
@@ -428,7 +424,7 @@ public class TradeDBManagerImpl implemen
     }
 
     /*
-     * Allocate a new prepared statment for this connection
+     * Allocate a new prepared statement for this connection
      */
     private PreparedStatement getStatement(Connection conn, String sql) throws Exception {
         return conn.prepareStatement(sql);

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeServicesManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeServicesManagerImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeServicesManagerImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeServicesManagerImpl.java Thu Apr  1 13:46:34 2010
@@ -41,13 +41,10 @@ import org.apache.aries.samples.ariestra
 public class TradeServicesManagerImpl implements TradeServicesManager {
 
     private static TradeServices[] tradeServicesList = new TradeServices[TradeConfig.runTimeModeNames.length] ;
-    private List tradeList = null;
-    private List tradeDBList = null;
 
     // This lock is used to serialize market summary operations.
     private static final Integer marketSummaryLock = new Integer(0);
     private static long nextMarketSummary = System.currentTimeMillis();
-//    private static MarketSummaryDataBean cachedMSDB = MarketSummaryDataBean.getRandomInstance();
     private static MarketSummaryDataBean cachedMSDB = null; 
     
     /**
@@ -89,7 +86,6 @@ public class TradeServicesManagerImpl im
     public void setTradeServicesList(List tradeList) {
         if (Log.doTrace())
             Log.trace("TradeServicesManagerImpl:setTradeServicesList()" , tradeList);
-        this.tradeList = tradeList;
         Iterator it = tradeList.iterator();
         while (it.hasNext()) {  
             TradeServices tradeServices =  (TradeServices) it.next(); 

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java Thu Apr  1 13:46:34 2010
@@ -106,9 +106,6 @@ public class AccountDataBeanImpl impleme
     @JoinColumn(name="PROFILE_USERID")
     private AccountProfileDataBeanImpl profile;
 
-//    @Version
-//    private Integer optock;
-
     /* Accessor methods for relationship fields are only included for the AccountProfile profileID */
     @Transient
     private String profileID;
@@ -254,12 +251,6 @@ public class AccountDataBeanImpl impleme
         this.profileID = profileID;
     }
 
-    /* Disabled for D185273
-     public String getUserID() {
-         return getProfileID();
-     }
-     */
-
     public Collection<OrderDataBean> getOrders() {
         Collection orderDataBeans = new ArrayList();
         for (OrderDataBeanImpl o : orders ) {

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java Thu Apr  1 13:46:34 2010
@@ -65,9 +65,6 @@ public class AccountProfileDataBeanImpl 
 	@OneToOne(mappedBy="profile", fetch=FetchType.LAZY)
     private AccountDataBeanImpl account;
 
-//    @Version
-//    private Integer optLock;
-
     public AccountProfileDataBeanImpl() {
     }
 

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java Thu Apr  1 13:46:34 2010
@@ -77,9 +77,6 @@ public class HoldingDataBeanImpl impleme
 	@JoinColumn(name = "QUOTE_SYMBOL")
 	private QuoteDataBeanImpl quote;
 
-	// @Version
-	// private Integer optLock;
-
 	public HoldingDataBeanImpl() {
 	}
 

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java Thu Apr  1 13:46:34 2010
@@ -76,7 +76,7 @@ public class OrderDataBeanImpl implement
 	@Column(name = "ORDERSTATUS")
 	private String orderStatus; /*
 								 * orderStatus (open, processing, completed,
-								 * closed, cancelled)
+								 * closed, canceled)
 								 */
 	@Column(name = "OPENDATE")
 	@Temporal(TemporalType.TIMESTAMP)

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/KeySequenceDirect.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/KeySequenceDirect.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/KeySequenceDirect.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/KeySequenceDirect.java Thu Apr  1 13:46:34 2010
@@ -26,8 +26,6 @@ import java.sql.ResultSet;
 
 import org.apache.aries.samples.ariestrader.util.*;
 
-import org.apache.aries.samples.ariestrader.*;
-
 public class KeySequenceDirect {
 
     private static HashMap keyMap = new HashMap();
@@ -69,7 +67,7 @@ public class KeySequenceDirect {
                 int keyVal = 0;
                 stmt2.setString(1, keyName);
                 stmt2.setInt(2, keyVal);
-                int rowCount = stmt2.executeUpdate();
+                stmt2.executeUpdate();
                 stmt2.close();
                 stmt.close();
                 stmt = conn.prepareStatement(getKeyForUpdateSQL);
@@ -85,7 +83,7 @@ public class KeySequenceDirect {
             stmt = conn.prepareStatement(updateKeyValueSQL);
             stmt.setInt(1, keyVal + TradeConfig.KEYBLOCKSIZE);
             stmt.setString(2, keyName);
-            int rowCount = stmt.executeUpdate();
+            stmt.executeUpdate();
             stmt.close();
 
             Collection block = new KeyBlock(keyVal, keyVal + TradeConfig.KEYBLOCKSIZE - 1);

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java Thu Apr  1 13:46:34 2010
@@ -19,8 +19,6 @@ package org.apache.aries.samples.ariestr
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.ArrayList;
-import javax.naming.InitialContext;
-
 import javax.sql.DataSource;
 
 import org.apache.aries.samples.ariestrader.api.TradeServices;
@@ -40,13 +38,9 @@ import org.apache.aries.samples.ariestra
 import org.apache.aries.samples.ariestrader.util.ServiceUtilities;
 import org.apache.aries.samples.ariestrader.util.TradeConfig;
 
-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;
 
 
@@ -77,8 +71,6 @@ public class TradeJdbc implements TradeS
 
     private boolean inSession = false;
 
-    private static InitialContext context;
-
     private static int connCount = 0;
 
     private static Integer lock = new Integer(0);
@@ -245,7 +237,7 @@ public class TradeJdbc implements TradeS
             releaseConn(conn);
         }
 
-        //after the purchase or sell of a stock, update the stocks volume and
+        //after the purchase or sale of a stock, update the stocks volume and
         // price
         updateQuotePriceVolume(symbol, TradeConfig.getRandomPriceChangeFactor(), quantity);
 
@@ -455,7 +447,6 @@ public class TradeJdbc implements TradeS
      * @see TradeServices#cancelOrder(Integer, boolean)
      */
     public void cancelOrder(Integer orderID, boolean twoPhase) throws Exception {
-        OrderDataBean orderData = null;
         Connection conn = null;
         try {
             if (Log.doTrace())
@@ -485,7 +476,6 @@ public class TradeJdbc implements TradeS
 
     private HoldingDataBean createHolding(Connection conn, int accountID, String symbol, double quantity,
         BigDecimal purchasePrice) throws Exception {
-        HoldingDataBean holdingData = null;
 
         Timestamp purchaseDate = new Timestamp(System.currentTimeMillis());
         PreparedStatement stmt = getStatement(conn, createHoldingSQL);
@@ -497,7 +487,7 @@ public class TradeJdbc implements TradeS
         stmt.setDouble(4, quantity);
         stmt.setString(5, symbol);
         stmt.setInt(6, accountID);
-        int rowCount = stmt.executeUpdate();
+        stmt.executeUpdate();
 
         stmt.close();
 
@@ -508,7 +498,7 @@ public class TradeJdbc implements TradeS
         PreparedStatement stmt = getStatement(conn, removeHoldingSQL);
 
         stmt.setInt(1, holdingID);
-        int rowCount = stmt.executeUpdate();
+        stmt.executeUpdate();
         stmt.close();
 
         // set the HoldingID to NULL for the purchase and sell order now that
@@ -516,15 +506,13 @@ public class TradeJdbc implements TradeS
         stmt = getStatement(conn, removeHoldingFromOrderSQL);
 
         stmt.setInt(1, holdingID);
-        rowCount = stmt.executeUpdate();
+        stmt.executeUpdate();
         stmt.close();
 
     }
 
     private OrderDataBean createOrder(Connection conn, AccountDataBean accountData, QuoteDataBean quoteData,
         HoldingDataBean holdingData, String orderType, double quantity) throws Exception {
-        OrderDataBean orderData = null;
-
         Timestamp currentDate = new Timestamp(System.currentTimeMillis());
 
         PreparedStatement stmt = getStatement(conn, createOrderSQL);
@@ -543,7 +531,7 @@ public class TradeJdbc implements TradeS
         else
             stmt.setInt(9, holdingData.getHoldingID().intValue());
         stmt.setString(10, quoteData.getSymbol());
-        int rowCount = stmt.executeUpdate();
+        stmt.executeUpdate();
 
         stmt.close();
 
@@ -909,31 +897,6 @@ public class TradeJdbc implements TradeS
         return accountData;
     }
 
-    private AccountDataBean getAccountDataForUpdate(int accountID, Connection conn) throws Exception {
-        PreparedStatement stmt = getStatement(conn, getAccountForUpdateSQL);
-        stmt.setInt(1, accountID);
-        ResultSet rs = stmt.executeQuery();
-        AccountDataBean accountData = getAccountDataFromResultSet(rs);
-        stmt.close();
-        return accountData;
-    }
-
-    private QuoteDataBean getQuoteData(String symbol) throws Exception {
-        QuoteDataBean quoteData = null;
-        Connection conn = null;
-        try {
-            conn = getConn();
-            quoteData = getQuoteData(conn, symbol);
-            commit(conn);
-        } catch (Exception e) {
-            Log.error("TradeJdbc:getQuoteData -- error getting data", e);
-            rollBack(conn, e);
-        } finally {
-            releaseConn(conn);
-        }
-        return quoteData;
-    }
-
     private QuoteDataBean getQuoteData(Connection conn, String symbol) throws Exception {
         QuoteDataBean quoteData = null;
         PreparedStatement stmt = getStatement(conn, getQuoteSQL);
@@ -977,22 +940,6 @@ public class TradeJdbc implements TradeS
         return holdingData;
     }
 
-    private OrderDataBean getOrderData(int orderID) throws Exception {
-        OrderDataBean orderData = null;
-        Connection conn = null;
-        try {
-            conn = getConn();
-            orderData = getOrderData(conn, orderID);
-            commit(conn);
-        } catch (Exception e) {
-            Log.error("TradeJdbc:getOrderData -- error getting data", e);
-            rollBack(conn, e);
-        } finally {
-            releaseConn(conn);
-        }
-        return orderData;
-    }
-
     private OrderDataBean getOrderData(Connection conn, int orderID) throws Exception {
         OrderDataBean orderData = null;
         if (Log.doTrace())
@@ -1043,26 +990,6 @@ public class TradeJdbc implements TradeS
         return accountProfileData;
     }
 
-    private AccountProfileDataBean getAccountProfileData(Integer accountID) throws Exception {
-        AccountProfileDataBean accountProfileData = null;
-        Connection conn = null;
-
-        try {
-            if (Log.doTrace())
-                Log.trace("TradeJdbc:getAccountProfileData", accountID);
-
-            conn = getConn();
-            accountProfileData = getAccountProfileData(conn, accountID);
-            commit(conn);
-        } catch (Exception e) {
-            Log.error("TradeJdbc:getAccountProfileData -- error getting profile data", e);
-            rollBack(conn, e);
-        } finally {
-            releaseConn(conn);
-        }
-        return accountProfileData;
-    }
-
     private AccountProfileDataBean getAccountProfileData(Connection conn, Integer accountID) throws Exception {
         PreparedStatement stmt = getStatement(conn, getAccountProfileForAccountSQL);
         stmt.setInt(1, accountID.intValue());
@@ -1106,7 +1033,7 @@ public class TradeJdbc implements TradeS
         stmt.setBigDecimal(1, credit);
         stmt.setInt(2, accountData.getAccountID().intValue());
 
-        int count = stmt.executeUpdate();
+        stmt.executeUpdate();
         stmt.close();
 
     }
@@ -1119,7 +1046,7 @@ public class TradeJdbc implements TradeS
 
         stmt.setTimestamp(1, ts);
         stmt.setInt(2, holdingID.intValue());
-        int count = stmt.executeUpdate();
+        stmt.executeUpdate();
         stmt.close();
     }
 
@@ -1129,7 +1056,7 @@ public class TradeJdbc implements TradeS
         stmt.setString(1, status);
         stmt.setTimestamp(2, new Timestamp(System.currentTimeMillis()));
         stmt.setInt(3, orderID.intValue());
-        int count = stmt.executeUpdate();
+        stmt.executeUpdate();
         stmt.close();
     }
 
@@ -1138,7 +1065,7 @@ public class TradeJdbc implements TradeS
 
         stmt.setInt(1, holdingID);
         stmt.setInt(2, orderID);
-        int count = stmt.executeUpdate();
+        stmt.executeUpdate();
         stmt.close();
     }
 
@@ -1152,17 +1079,7 @@ public class TradeJdbc implements TradeS
         stmt.setString(5, creditcard);
         stmt.setString(6, userID);
 
-        int count = stmt.executeUpdate();
-        stmt.close();
-    }
-
-    private void updateQuoteVolume(Connection conn, QuoteDataBean quoteData, double quantity) throws Exception {
-        PreparedStatement stmt = getStatement(conn, updateQuoteVolumeSQL);
-
-        stmt.setDouble(1, quantity);
-        stmt.setString(2, quoteData.getSymbol());
-
-        int count = stmt.executeUpdate();
+        stmt.executeUpdate();
         stmt.close();
     }
 
@@ -1241,18 +1158,10 @@ public class TradeJdbc implements TradeS
         stmt.setDouble(3, newVolume);
         stmt.setString(4, symbol);
 
-        int count = stmt.executeUpdate();
+        stmt.executeUpdate();
         stmt.close();
     }
 
-    private void publishQuotePriceChange(QuoteDataBean quoteData, BigDecimal oldPrice, BigDecimal changeFactor,
-        double sharesTraded) throws Exception {
-        if (!TradeConfig.getPublishQuotePriceChange())
-            return;
-        Log.error("TradeJdbc:publishQuotePriceChange - is not implemented for this runtime mode");
-        throw new UnsupportedOperationException("TradeJdbc:publishQuotePriceChange-  is not implemented for this runtime mode");
-    }
-
     /**
      * @see TradeServices#login(String, String)
      */
@@ -1290,8 +1199,7 @@ public class TradeJdbc implements TradeS
             stmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
             stmt.setString(2, userID);
 
-            int rows = stmt.executeUpdate();
-            // ?assert rows==1?
+            stmt.executeUpdate();
             stmt.close();
 
             stmt = getStatement(conn, getAccountForUserSQL);
@@ -1581,8 +1489,6 @@ public class TradeJdbc implements TradeS
 
     private static final String getAccountSQL = "select * from accountejb a where a.accountid = ?";
 
-    private static final String getAccountForUpdateSQL = "select * from accountejb a where a.accountid = ? for update";
-
     private final static String getAccountProfileSQL =
         "select * from accountprofileejb ap where ap.userid = "
             + "(select profile_userid from accountejb a where a.profile_userid=?)";
@@ -1642,9 +1548,6 @@ public class TradeJdbc implements TradeS
     private static final String updateOrderHoldingSQL =
         "update orderejb set " + "holding_holdingID = ? " + "where orderid = ?";
 
-    private static final String updateQuoteVolumeSQL =
-        "update quoteejb set " + "volume = volume + ? " + "where symbol = ?";
-
     private static final String updateQuotePriceVolumeSQL =
         "update quoteejb set " + "price = ?, change1 = ? - open1, volume = ? " + "where symbol = ?";
 

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/am/TradeJpaAm.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/am/TradeJpaAm.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/am/TradeJpaAm.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/am/TradeJpaAm.java Thu Apr  1 13:46:34 2010
@@ -24,8 +24,6 @@ import java.util.Iterator;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.PersistenceUnit;
 import javax.persistence.Query;
 
 import org.apache.aries.samples.ariestrader.api.TradeServices;
@@ -64,8 +62,6 @@ public class TradeJpaAm implements Trade
 //    @PersistenceUnit(unitName="ariestrader-am")
     private static EntityManagerFactory emf;
 
-    private static BigDecimal ZERO = new BigDecimal(0.0);
-
     private static boolean initialized = false;
 
     /**
@@ -221,7 +217,7 @@ public class TradeJpaAm implements Trade
             entityManager = null;
         }
 
-        // after the purchase or sell of a stock, update the stocks volume and
+        // after the purchase or sale of a stock, update the stocks volume and
         // price
         updateQuotePriceVolume(symbol, TradeConfig.getRandomPriceChangeFactor(), quantity);
 
@@ -348,8 +344,6 @@ public class TradeJpaAm implements Trade
         BigDecimal price = order.getPrice();
         double quantity = order.getQuantity();
 
-        String userID = account.getProfile().getUserID();
-
         if (Log.doTrace())
             Log.trace("TradeJpaAm:completeOrder--> Completing Order "
                       + order.getOrderID() + "\n\t Order info: " + order
@@ -683,7 +677,7 @@ public class TradeJpaAm implements Trade
         entityManager.getTransaction().commit();
         Collection<HoldingDataBean> holdings = query.getResultList();
         /*
-         * Inflate the lazy data memebers
+         * Inflate the lazy data members
          */
         Iterator itr = holdings.iterator();
         while (itr.hasNext()) {

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/cm/TradeJpaCm.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/cm/TradeJpaCm.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/cm/TradeJpaCm.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/cm/TradeJpaCm.java Thu Apr  1 13:46:34 2010
@@ -23,7 +23,6 @@ import java.util.Collection;
 import java.util.Iterator;
 
 import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
 import org.apache.aries.samples.ariestrader.api.TradeServices;
@@ -60,8 +59,6 @@ public class TradeJpaCm implements Trade
 
     private EntityManager entityManager;
 
-    private static BigDecimal ZERO = new BigDecimal(0.0);
-
     private static boolean initialized = false;
 
 //    @PersistenceContext(unitName="ariestrader-cm")
@@ -193,7 +190,7 @@ public class TradeJpaCm implements Trade
             throw new RuntimeException(e);
         }
 
-        // after the purchase or sell of a stock, update the stocks volume and
+        // after the purchase or sale of a stock, update the stocks volume and
         // price
         updateQuotePriceVolume(symbol, TradeConfig.getRandomPriceChangeFactor(), quantity);
 
@@ -297,8 +294,6 @@ public class TradeJpaCm implements Trade
         BigDecimal price = order.getPrice();
         double quantity = order.getQuantity();
 
-        String userID = account.getProfile().getUserID();
-
         if (Log.doTrace())
             Log.trace("TradeJpaCm:completeOrder--> Completing Order "
                       + order.getOrderID() + "\n\t Order info: " + order
@@ -531,7 +526,7 @@ public class TradeJpaCm implements Trade
 
         holdings = query.getResultList();
         /*
-         * Inflate the lazy data memebers
+         * Inflate the lazy data members
          */
         Iterator itr = holdings.iterator();
         while (itr.hasNext()) {

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/FinancialUtils.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/FinancialUtils.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/FinancialUtils.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/FinancialUtils.java Thu Apr  1 13:46:34 2010
@@ -16,8 +16,6 @@
  */
 package org.apache.aries.samples.ariestrader.util;
 
-import java.util.Collection;
-import java.util.Iterator;
 import java.math.BigDecimal;
 
 public class FinancialUtils {
@@ -93,7 +91,6 @@ public class FinancialUtils {
 
     public static String printQuoteLink(String symbol)  
     {
-        String htmlString;
         return "<A href=\"app?action=quotes&symbols="+ symbol+"\">" + symbol + "</A>";
     }
 

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java Thu Apr  1 13:46:34 2010
@@ -86,7 +86,7 @@ public class TradeConfig {
 	private static int MAX_USERS = 200;
 	private static int MAX_QUOTES = 400;
 
-	/* Trade Database specific paramters */
+	/* Trade Database specific parameters */
 	public static String JDBC_UID = null;
 	public static String JDBC_PWD = null;
 
@@ -105,14 +105,12 @@ public class TradeConfig {
 	public static int KEYBLOCKSIZE = 1000;
 	public static int QUOTES_PER_PAGE = 10;
 	public static boolean RND_USER = true;
-	//public static int		RND_SEED = 0;
 	private static int MAX_HOLDINGS = 10;
 	private static int count = 0;
 	private static Object userID_count_semaphore = new Object();
 	private static int userID_count = 0;
 	private static String hostName = null;
 	private static Random r0 = new Random(System.currentTimeMillis());
-	//private static Random r1 = new Random(RND_SEED);
 	private static Random randomNumberGenerator = r0;
 	public static final String newUserPrefix = "ru:";
 	public static final int verifyPercent = 5;
@@ -231,17 +229,6 @@ public class TradeConfig {
 		//JSP Interface	
 	};
 
-	// These are the property settings the VAJ access beans look for.	
-	private static final String NAMESERVICE_TYPE_PROPERTY =
-		"java.naming.factory.initial";
-	private static final String NAMESERVICE_PROVIDER_URL_PROPERTY =
-		"java.naming.provider.url";
-
-	// FUTURE:
-	// If a "trade2.properties" property file is supplied, reset the default values 
-	// to match those specified in the file. This provides a persistent runtime 
-	// property mechanism during server startup
-
 	/**
 	 * Return the hostname for this system
 	 * Creation date: (2/16/2000 9:02:25 PM)
@@ -251,7 +238,7 @@ public class TradeConfig {
 		try {
 			if (hostName == null) {
 				hostName = java.net.InetAddress.getLocalHost().getHostName();
-				//Strip of fully qualifed domain if necessary
+				//Strip of fully qualified domain if necessary
 				try {
 					hostName = hostName.substring(0, hostName.indexOf('.'));
 				} catch (Exception e) {
@@ -418,7 +405,6 @@ public class TradeConfig {
 	}
 	private final static BigDecimal ONE = new BigDecimal(1.0);
 	public static BigDecimal getRandomPriceChangeFactor() {
-		// CJB (DAYTRADER-25) - Vary change factor between 1.2 and 0.8
 		double percentGain = rndFloat(1) * 0.2;
 		if (random() < .5)
 			percentGain *= -1;
@@ -520,7 +506,6 @@ public class TradeConfig {
 					}
 				}
 			} catch (Exception e) {
-				//>>rjm
 				Log.error(
 					"TradeConfig.setConfigParm(..): minor exception caught"
 						+ "trying to set runtimemode to "
@@ -641,7 +626,6 @@ public class TradeConfig {
 			try {
 				MAX_QUOTES = Integer.parseInt(value);
 			} catch (Exception e) {
-				//>>rjm
 				Log.error(
 					"TradeConfig.setConfigParm(...) minor exception caught"
 						+ "Setting max_quotes, error parsing string to int "
@@ -649,7 +633,6 @@ public class TradeConfig {
 						+ "reverting to current value: "
 						+ MAX_QUOTES,
 					e);
-				//<<rjm
 			} //On error, revert to saved		
 		} else if (parm.equalsIgnoreCase("primIterations")) {
 			try {
@@ -847,7 +830,6 @@ public class TradeConfig {
 	
 	public static void setSoapURL(String value) {
 		SoapURL = value;
-//		TradeWebSoapProxy.updateServicePort();
 	}
 	
 	public static int getAccessMode() {
@@ -856,7 +838,6 @@ public class TradeConfig {
 	
 	public static void setAccessMode(int value) {
 		accessMode = value;
-//		TradeWebSoapProxy.updateServicePort();
 	}
 
     public static int getRunTimeMode() {

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/OrdersAlertFilter.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/OrdersAlertFilter.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/OrdersAlertFilter.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/OrdersAlertFilter.java Thu Apr  1 13:46:34 2010
@@ -88,7 +88,6 @@ public class OrdersAlertFilter implement
         }
 
         ServletContext sc = filterConfig.getServletContext();
-        //String xyz = (String) sc.getAttribute("hitCounter");
         chain.doFilter(req, resp/*wrapper*/);        
 
     }

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeAppServlet.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeAppServlet.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeAppServlet.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeAppServlet.java Thu Apr  1 13:46:34 2010
@@ -102,10 +102,6 @@ public class TradeAppServlet extends Htt
 
         String action = null;
         String userID = null;
-        // String to create full dispatch path to TradeAppServlet w/ request
-        // Parameters
-        String dispPath = null; // Dispatch Path to TradeAppServlet
-
         resp.setContentType("text/html");
 
         if (tradeServicesManager == null) {
@@ -126,7 +122,6 @@ public class TradeAppServlet extends Htt
         } else if (action.equals("login")) {
             userID = req.getParameter("uid");
             String passwd = req.getParameter("passwd");
-            String inScenario = req.getParameter("inScenario");
             tsAction.doLogin(ctx, req, resp, userID, passwd);
             return;
         } else if (action.equals("register")) {
@@ -195,12 +190,4 @@ public class TradeAppServlet extends Htt
         }
     }
 
-    private void sendRedirect(HttpServletResponse resp, String page)
-            throws ServletException, IOException {
-        resp.sendRedirect(resp.encodeRedirectURL(page));
-    }
-
-    // URL Path Prefix for dispatching to TradeAppServlet
-    private final static String tasPathPrefix = "/app?action=";
-
 }
\ No newline at end of file

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java Thu Apr  1 13:46:34 2010
@@ -41,8 +41,6 @@ import org.apache.aries.samples.ariestra
  */
 public class TradeBuildDB {
 
-    private boolean verbose = true;
-    private TradeConfig t = new TradeConfig();
     private static TradeServicesManager tradeServicesManager = null;
     private static TradeDBManager tradeDBManager = null;
 
@@ -182,9 +180,8 @@ public class TradeBuildDB {
             symbol = "s:" + i;
             companyName = "S" + i + " Incorporated";
             try {
-                QuoteDataBean quoteData =
-                    tradeServices.createQuote(symbol, companyName,
-                        new java.math.BigDecimal(TradeConfig.rndPrice()));
+                tradeServices.createQuote(symbol, companyName,
+				    new java.math.BigDecimal(TradeConfig.rndPrice()));
                 if (i % 10 == 0) {
                     out.print("....." + symbol);
                     if (i % 100 == 0) {
@@ -223,7 +220,6 @@ public class TradeBuildDB {
                 AccountDataBean accountData =
                     tradeServices.register(userID, "xxx", fullname, address,
                         email, creditcard, new BigDecimal(initialBalance));
-                String results;
                 if (accountData != null) {
                     if (i % 50 == 0) {
                         out.print("<BR>Account# " + accountData.getAccountID()
@@ -233,13 +229,11 @@ public class TradeBuildDB {
                     // 0-MAX_HOLDING (inclusive), avg holdings per user = (MAX-0)/2
                     int holdings = TradeConfig.rndInt(TradeConfig.getMAX_HOLDINGS() + 1); 
                     double quantity = 0;
-                    OrderDataBean orderData;
                     for (int j = 0; j < holdings; j++) {
                         symbol = TradeConfig.rndSymbol();
                         quantity = TradeConfig.rndQuantity();
-                        orderData =
-                            tradeServices.buy(userID, symbol, quantity,
-                                TradeConfig.orderProcessingMode);
+                        tradeServices.buy(userID, symbol, quantity,
+						    TradeConfig.orderProcessingMode);
                     }
                     if (i % 50 == 0) {
                         out.println(" has " + holdings + " holdings.");
@@ -253,8 +247,6 @@ public class TradeBuildDB {
 
             } catch (Exception e) {
                 if (errorCount++ >= 10) {
-                    AccountProfileDataBean accountProfileData = null;
-
                     String error = "Populate Trade DB aborting after 10 user registration errors. "+
                         "Check the log for details. <BR><BR> Exception is: <BR>" + e.toString();
                     Log.error(e, error);
@@ -284,7 +276,6 @@ public class TradeBuildDB {
                     if (s.endsWith(";")) // reached end of sql statement
                     {
                         sql = sql.replace(';', ' '); // remove the semicolon
-                        // System.out.println (sql);
                         sqlBuffer.add(sql);
                         sql = "";
                     }

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java Thu Apr  1 13:46:34 2010
@@ -103,14 +103,12 @@ public class TradeConfigServlet extends 
 	
 	
 	/**
-	 * Update Trade runtime configuration paramaters
+	 * Update Trade runtime configuration parameters
 	 * Creation date: (2/8/2000 3:44:24 PM)
 	 */
 	void doConfigUpdate(HttpServletRequest req, HttpServletResponse resp)
 		throws Exception {
 
-		TradeConfig currentConfig = new TradeConfig();
-
 		String currentConfigStr = "\n\n########## Trade configuration update. Current config:\n\n";
 		String runTimeModeStr = req.getParameter("RunTimeMode");
 		if (runTimeModeStr != null)
@@ -125,7 +123,6 @@ public class TradeConfigServlet extends 
 			}
 			catch (Exception e)
 			{
-				//>>rjm
 				Log.error(
 					e, 
 					"TradeConfigServlet.doConfigUpdate(..): minor exception caught", 
@@ -171,7 +168,6 @@ public class TradeConfigServlet extends 
 			}
 			catch (Exception e)
 			{
-				//>>rjm
 				Log.error(
 					e, 
 					"TradeConfigServlet.doConfigUpdate(..): minor exception caught", 
@@ -194,7 +190,6 @@ public class TradeConfigServlet extends 
 			}
 			catch (Exception e)
 			{
-				//>>rjm
 				Log.error(
 					e, 
 					"TradeConfigServlet.doConfigUpdate(..): minor exception caught", 
@@ -311,13 +306,11 @@ public class TradeConfigServlet extends 
 			}
 			catch (Exception e)
 			{
-				//>>rjm
 				Log.error(
 					e, 
 					"TradeConfigServlet: minor exception caught", 
 					"trying to set max_quotes, error on parsing int " + parm, 
 					"reverting to current value " + TradeConfig.getMAX_QUOTES());
-				//<<rjm
 
 			} //On error, revert to saved
 		}

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeServletAction.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeServletAction.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeServletAction.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeServletAction.java Thu Apr  1 13:46:34 2010
@@ -17,12 +17,9 @@
  */
 package org.apache.aries.samples.ariestrader.web;
 
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.aries.samples.ariestrader.api.TradeServiceUtilities;
 import org.apache.aries.samples.ariestrader.api.TradeServices;
 import org.apache.aries.samples.ariestrader.api.persistence.*;
 import org.apache.aries.samples.ariestrader.util.*;
@@ -160,8 +157,7 @@ public class TradeServletAction {
             results = "Update profile error: please fill in all profile information fields";
             doUpdate = false;
         }
-//        AccountProfileDataBean accountProfileData = new AccountProfileDataBean(
-//                userID, password, fullName, address, email, creditcard);
+
         try {
             if (doUpdate) {
                 tradeServices.updateAccountProfile(userID, password, fullName, address, email, creditcard);
@@ -263,9 +259,6 @@ public class TradeServletAction {
             HttpServletResponse resp, String userID, String results)
             throws javax.servlet.ServletException, java.io.IOException {
         
-        BigDecimal balance;
-        String result = "";
-        
         try {
             AccountDataBean accountData = tradeServices.getAccountData(userID);
             Collection holdingDataBeans = tradeServices.getHoldings(userID);
@@ -291,7 +284,6 @@ public class TradeServletAction {
                       + "treating this as a user error and forwarding on to a new page",
                       e);
         } catch (Exception e) {
-            boolean javaee = false;
             throw new ServletException("TradeServletAction.doHome(...)" + " exception user =" + userID, e);
         }
 
@@ -420,7 +412,7 @@ public class TradeServletAction {
                             "illegal argument, information should be in exception string",
                             "treating this as a user error and forwarding on to a new page");
         } catch (Exception e) {
-            // log the exception and foward to a error page
+            // log the exception and forward to a error page
             Log.error(e, "TradeServletAction.doLogout(...):",
                     "Error logging out" + userID, "fowarding to an error page");
             // set the status_code to 500
@@ -472,7 +464,7 @@ public class TradeServletAction {
             throws ServletException, IOException {
 
         try {
-            // Get the holdiings for this user
+            // Get the holdings for this user
 
             Collection quoteDataBeans = new ArrayList();
             Collection holdingDataBeans = tradeServices.getHoldings(userID);
@@ -505,8 +497,7 @@ public class TradeServletAction {
                     .getPage(TradeConfig.PORTFOLIO_PAGE));
             // log the exception with an error level of 3 which means, handled
             // exception but would invalidate a automation run
-            Log
-                    .error(
+            Log.error(
                             e,
                             "TradeServletAction.doPortfolio(...)",
                             "illegal argument, information should be in exception string",
@@ -666,12 +657,10 @@ public class TradeServletAction {
             // just log the exception and then later on I will redisplay the
             // portfolio page
             // because this is just a user exception
-            Log
-                    .error(
-                            e,
-                            "TradeServletAction.doSell(...)",
-                            "illegal argument, information should be in exception string",
-                            "user error");
+            Log.error(e,
+                      "TradeServletAction.doSell(...)",
+                      "illegal argument, information should be in exception string",
+                      "user error");
         } catch (Exception e) {
             // log the exception with error page
             throw new ServletException("TradeServletAction.doSell(...)"
@@ -697,9 +686,4 @@ public class TradeServletAction {
 
         ctx.getRequestDispatcher(page).include(req, resp);
     }
-
-    private void sendRedirect(HttpServletResponse resp, String page)
-            throws ServletException, IOException {
-        resp.sendRedirect(resp.encodeRedirectURL(page));
-    }
 }
\ No newline at end of file

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Include.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Include.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Include.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Include.java Thu Apr  1 13:46:34 2010
@@ -22,8 +22,6 @@ import javax.servlet.http.*;
 
 import org.apache.aries.samples.ariestrader.util.*;
 
-import org.apache.aries.samples.ariestrader.*;
-
 /**
  *
  * PingServlet2Include tests servlet to servlet request dispatching. Servlet 1,
@@ -56,7 +54,6 @@ public class PingServlet2Include extends
 	**/
 	public void doGet(HttpServletRequest req, HttpServletResponse res)
 		throws ServletException, IOException {
-		PingBean ab;
 		try {
 			res.setContentType("text/html");
 			
@@ -65,7 +62,6 @@ public class PingServlet2Include extends
 				getServletConfig().getServletContext().getRequestDispatcher("/servlet/PingServlet2IncludeRcv").include(req, res);
 			}
 			
-//			ServletOutputStream out = res.getOutputStream();
 			java.io.PrintWriter out = res.getWriter();
 			out.println(
 				"<html><head><title>Ping Servlet 2 Include</title></head>"

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2JNDI.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2JNDI.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2JNDI.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2JNDI.java Thu Apr  1 13:46:34 2010
@@ -19,13 +19,8 @@ package org.apache.aries.samples.ariestr
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-
 import org.apache.aries.samples.ariestrader.util.*;
 
-import org.apache.aries.samples.ariestrader.*;
-
 /**
  * 
  * PingServlet2JNDI performs a basic JNDI lookup of a JDBC DataSource
@@ -65,11 +60,6 @@ public class PingServlet2JNDI extends Ht
 		try
 			{
 
-			int iter = TradeConfig.getPrimIterations();
-			for (int ii = 0; ii < iter; ii++) {
-                            DataSource dataSource = (DataSource) ServiceUtilities.getOSGIService(DataSource.class.getName(),TradeConfig.OSGI_DS_NAME_FILTER);
-			}			
-
 			output.append(
 				"<html><head><title>Ping JNDI -- lookup of JDBC DataSource</title></head>"
 					+ "<body><HR><FONT size=\"+2\" color=\"#000066\">Ping JNDI -- lookup of JDBC DataSource</FONT><HR><FONT size=\"-1\" color=\"#000066\">Init time : "

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession1.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession1.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession1.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession1.java Thu Apr  1 13:46:34 2010
@@ -95,9 +95,9 @@ public void doGet(HttpServletRequest req
 	}
 	catch (Exception e)
 	{
-		//log the excecption
+		//log the exception
 		Log.error(e, "PingSession1.doGet(..l.): error."); 
-		//set the server responce to 500 and forward to the web app defined error page 
+		//set the server response to 500 and forward to the web app defined error page 
 		response.sendError(
 			500, 
 			"PingSession1.doGet(...): error. " + e.toString()); 

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession2.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession2.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession2.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession2.java Thu Apr  1 13:46:34 2010
@@ -114,9 +114,9 @@ public void doGet(HttpServletRequest req
 
 	catch (Exception e)
 	{
-		//log the excecption
+		//log the exception
 		Log.error(e, "PingSession2.doGet(...): error."); 
-		//set the server responce to 500 and forward to the web app defined error page 
+		//set the server response to 500 and forward to the web app defined error page 
 		response.sendError(
 			500, 
 			"PingSession2.doGet(...): error. " + e.toString()); 

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3.java Thu Apr  1 13:46:34 2010
@@ -147,9 +147,9 @@ public void doGet(HttpServletRequest req
 	}
 	catch (Exception e)
 	{
-		//log the excecption
+		//log the exception
 		Log.error(e, "PingSession3.doGet(..l.): error."); 
-		//set the server responce to 500 and forward to the web app defined error page 
+		//set the server response to 500 and forward to the web app defined error page 
 		response.sendError(
 			500, 
 			"PingSession3.doGet(...): error. " + e.toString()); 	}

Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3Object.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3Object.java?rev=929972&r1=929971&r2=929972&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3Object.java (original)
+++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3Object.java Thu Apr  1 13:46:34 2010
@@ -38,8 +38,6 @@ public class PingSession3Object implemen
 
 	String s1 = new String("123456789012");	 
 	String s2 = new String("abcdefghijkl");
-//										 String type size = ~2*12*16 =   384
-//										 Total blob size (w/o overhead) =  1024
 
 
 //	 The Session blob must be filled with data to avoid compression of the blob during serialization