geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r890405 [1/2] - in /geronimo/sandbox/jbohn/daytrader-bp-new: assemblies/web/daytrader-eba-jdbc/ assemblies/web/daytrader-eba-jpa/ assemblies/web/daytrader-web-jdbc/ assemblies/web/daytrader-web-jdbc/src/main/webapp/ assemblies/web/daytrader...
Date Mon, 14 Dec 2009 17:12:31 GMT
Author: jbohn
Date: Mon Dec 14 17:12:27 2009
New Revision: 890405

URL: http://svn.apache.org/viewvc?rev=890405&view=rev
Log:
rework some modules - move TradeServices interface into its own bundle, remove dependencies on core from persist-jpa and persist-jdbc, etc...

Added:
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java
      - copied, changed from r888993, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/MarketSummaryDataBean.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java
      - copied, changed from r888993, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/RunStatsDataBean.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java   (with props)
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java   (with props)
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml   (with props)
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/geronimo/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/geronimo/samples/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/geronimo/samples/daytrader/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/geronimo/samples/daytrader/spi/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/geronimo/samples/daytrader/spi/TradeServices.java
      - copied, changed from r888993, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServices.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/FinancialUtils.java
      - copied, changed from r889746, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/FinancialUtils.java
Removed:
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/FinancialUtils.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/MarketSummaryDataBean.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/RunStatsDataBean.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServices.java
Modified:
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehome.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehomeImg.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeDBManager.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServiceUtilities.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServicesManager.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TestServlet.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCRead.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml Mon Dec 14 17:12:27 2009
@@ -44,6 +44,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-tradeservices-interface</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-entities</artifactId>
             <version>${version}</version>
         </dependency>
@@ -87,6 +92,11 @@
                             </artifactItem>
                             <artifactItem>
                               <groupId>org.apache.geronimo.daytrader.modules</groupId>
+                              <artifactId>daytrader-tradeservices-interface</artifactId>
+                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                            </artifactItem>
+                            <artifactItem>
+                              <groupId>org.apache.geronimo.daytrader.modules</groupId>
                               <artifactId>daytrader-entities</artifactId>
                               <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml Mon Dec 14 17:12:27 2009
@@ -44,6 +44,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-tradeservices-interface</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-entities</artifactId>
             <version>${version}</version>
         </dependency>
@@ -92,6 +97,11 @@
                             </artifactItem>
                             <artifactItem>
                               <groupId>org.apache.geronimo.daytrader.modules</groupId>
+                              <artifactId>daytrader-tradeservices-interface</artifactId>
+                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                            </artifactItem>
+                            <artifactItem>
+                              <groupId>org.apache.geronimo.daytrader.modules</groupId>
                               <artifactId>daytrader-entities</artifactId>
                               <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/pom.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/pom.xml Mon Dec 14 17:12:27 2009
@@ -44,14 +44,12 @@
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
-<!--
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-beans</artifactId>
-            <version>${version}</version>
+            <artifactId>daytrader-tradeservices-interface</artifactId>
+            <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
--->        
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-entities</artifactId>
@@ -146,6 +144,7 @@
                   <Import-Package>
                       org.apache.geronimo.samples.daytrader.beans;version=1.0,
                       org.apache.geronimo.samples.daytrader.core.spi;version=1.0,
+                      org.apache.geronimo.samples.daytrader.spi;version=1.0,
                       org.apache.geronimo.samples.daytrader.util;version=1.0
                   </Import-Package>
                 </instructions>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp Mon Dec 14 17:12:27 2009
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ page
-	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.spi.*, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <% 
     String symbol = request.getParameter("symbol");

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp Mon Dec 14 17:12:27 2009
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ page
-	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.spi.*, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <%

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp Mon Dec 14 17:12:27 2009
@@ -31,6 +31,23 @@
 	scope="request" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection"
 	scope="request" />
+<%!
+
+  BigDecimal computeHoldingsTotal(Collection holdingDataBeans) {
+      BigDecimal holdingsTotal = new BigDecimal(0.0).setScale(2);
+      if (holdingDataBeans == null)
+          return holdingsTotal;
+      Iterator it = holdingDataBeans.iterator();
+      while (it.hasNext()) {
+          HoldingDataBean holdingData = (HoldingDataBean) it.next();
+          BigDecimal total =
+          holdingData.getPurchasePrice().multiply(new BigDecimal(holdingData.getQuantity()));
+          holdingsTotal = holdingsTotal.add(total);
+      }
+      return holdingsTotal.setScale(2);
+  }
+
+%>
 <TABLE height="54">
 	<TBODY>
 		<TR>
@@ -162,7 +179,7 @@
 						<TD align="left" valign="top" width="212"><% 
                         	BigDecimal openBalance = accountData.getOpenBalance();
                         	BigDecimal balance = accountData.getBalance();
-                        	BigDecimal holdingsTotal = FinancialUtils.computeHoldingsTotal(holdingDataBeans);
+                        	BigDecimal holdingsTotal = computeHoldingsTotal(holdingDataBeans);
                         	BigDecimal sumOfCashHoldings = balance.add(holdingsTotal);
                         	BigDecimal gain = FinancialUtils.computeGain(sumOfCashHoldings, openBalance);
 							BigDecimal gainPercent = FinancialUtils.computeGainPercent(sumOfCashHoldings, openBalance);

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp Mon Dec 14 17:12:27 2009
@@ -18,7 +18,7 @@
 <HTML>
 <HEAD>
 <META http-equiv="Content-Style-Type" content="text/css">
-<TITLE>Welcome to Trade</TITLE>
+<TITLE>Welcome to DayTrader</TITLE>
 <LINK rel="stylesheet" href="style.css" type="text/css" />
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
@@ -31,6 +31,23 @@
 	scope="request" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection"
 	scope="request" />
+<%!
+
+  BigDecimal computeHoldingsTotal(Collection holdingDataBeans) {
+      BigDecimal holdingsTotal = new BigDecimal(0.0).setScale(2);
+      if (holdingDataBeans == null)
+          return holdingsTotal;
+      Iterator it = holdingDataBeans.iterator();
+      while (it.hasNext()) {
+          HoldingDataBean holdingData = (HoldingDataBean) it.next();
+          BigDecimal total =
+          holdingData.getPurchasePrice().multiply(new BigDecimal(holdingData.getQuantity()));
+          holdingsTotal = holdingsTotal.add(total);
+      }
+      return holdingsTotal.setScale(2);
+  }
+
+%>
 <TABLE height="54">
 	<TBODY>
 		<TR>
@@ -168,7 +185,7 @@
 						<TD align="left" valign="top" width="212"><% 
                         	BigDecimal openBalance = accountData.getOpenBalance();
                         	BigDecimal balance = accountData.getBalance();
-                        	BigDecimal holdingsTotal = FinancialUtils.computeHoldingsTotal(holdingDataBeans);
+                        	BigDecimal holdingsTotal = computeHoldingsTotal(holdingDataBeans);
                         	BigDecimal sumOfCashHoldings = balance.add(holdingsTotal);
                         	BigDecimal gain = FinancialUtils.computeGain(sumOfCashHoldings, openBalance);
 							BigDecimal gainPercent = FinancialUtils.computeGainPercent(sumOfCashHoldings, openBalance);

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/pom.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/pom.xml Mon Dec 14 17:12:27 2009
@@ -46,6 +46,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-tradeservices-interface</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-entities</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
@@ -138,6 +144,7 @@
                   <Import-Package>
                       org.apache.geronimo.samples.daytrader.beans;version=1.0,
                       org.apache.geronimo.samples.daytrader.core.spi;version=1.0,
+                      org.apache.geronimo.samples.daytrader.spi;version=1.0,
                       org.apache.geronimo.samples.daytrader.util;version=1.0
                   </Import-Package>
                 </instructions>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp Mon Dec 14 17:12:27 2009
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ page
-	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.spi.*, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <% 
     String symbol = request.getParameter("symbol");

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp Mon Dec 14 17:12:27 2009
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ page
-	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.spi.*, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <%

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehome.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehome.jsp?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehome.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehome.jsp Mon Dec 14 17:12:27 2009
@@ -31,6 +31,23 @@
 	scope="request" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection"
 	scope="request" />
+<%!
+
+  BigDecimal computeHoldingsTotal(Collection holdingDataBeans) {
+      BigDecimal holdingsTotal = new BigDecimal(0.0).setScale(2);
+      if (holdingDataBeans == null)
+          return holdingsTotal;
+      Iterator it = holdingDataBeans.iterator();
+      while (it.hasNext()) {
+          HoldingDataBean holdingData = (HoldingDataBean) it.next();
+          BigDecimal total =
+          holdingData.getPurchasePrice().multiply(new BigDecimal(holdingData.getQuantity()));
+          holdingsTotal = holdingsTotal.add(total);
+      }
+      return holdingsTotal.setScale(2);
+  }
+
+%>
 <TABLE height="54">
 	<TBODY>
 		<TR>
@@ -162,7 +179,7 @@
 						<TD align="left" valign="top" width="212"><% 
                         	BigDecimal openBalance = accountData.getOpenBalance();
                         	BigDecimal balance = accountData.getBalance();
-                        	BigDecimal holdingsTotal = FinancialUtils.computeHoldingsTotal(holdingDataBeans);
+                        	BigDecimal holdingsTotal = computeHoldingsTotal(holdingDataBeans);
                         	BigDecimal sumOfCashHoldings = balance.add(holdingsTotal);
                         	BigDecimal gain = FinancialUtils.computeGain(sumOfCashHoldings, openBalance);
 							BigDecimal gainPercent = FinancialUtils.computeGainPercent(sumOfCashHoldings, openBalance);

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehomeImg.jsp?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehomeImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/src/main/webapp/tradehomeImg.jsp Mon Dec 14 17:12:27 2009
@@ -31,6 +31,23 @@
 	scope="request" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection"
 	scope="request" />
+<%!
+
+  BigDecimal computeHoldingsTotal(Collection holdingDataBeans) {
+      BigDecimal holdingsTotal = new BigDecimal(0.0).setScale(2);
+      if (holdingDataBeans == null)
+          return holdingsTotal;
+      Iterator it = holdingDataBeans.iterator();
+      while (it.hasNext()) {
+          HoldingDataBean holdingData = (HoldingDataBean) it.next();
+          BigDecimal total =
+          holdingData.getPurchasePrice().multiply(new BigDecimal(holdingData.getQuantity()));
+          holdingsTotal = holdingsTotal.add(total);
+      }
+      return holdingsTotal.setScale(2);
+  }
+
+%>
 <TABLE height="54">
 	<TBODY>
 		<TR>
@@ -168,7 +185,7 @@
 						<TD align="left" valign="top" width="212"><% 
                         	BigDecimal openBalance = accountData.getOpenBalance();
                         	BigDecimal balance = accountData.getBalance();
-                        	BigDecimal holdingsTotal = FinancialUtils.computeHoldingsTotal(holdingDataBeans);
+                        	BigDecimal holdingsTotal = computeHoldingsTotal(holdingDataBeans);
                         	BigDecimal sumOfCashHoldings = balance.add(holdingsTotal);
                         	BigDecimal gain = FinancialUtils.computeGain(sumOfCashHoldings, openBalance);
 							BigDecimal gainPercent = FinancialUtils.computeGainPercent(sumOfCashHoldings, openBalance);

Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java (from r888993, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/MarketSummaryDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/MarketSummaryDataBean.java&r1=888993&r2=890405&rev=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/MarketSummaryDataBean.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java Mon Dec 14 17:12:27 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.core.spi;
+package org.apache.geronimo.samples.daytrader.beans;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -24,6 +24,7 @@
 import java.util.Iterator;
 
 import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
+import org.apache.geronimo.samples.daytrader.util.FinancialUtils;
 import org.apache.geronimo.samples.daytrader.util.Log;
 import org.apache.geronimo.samples.daytrader.util.TradeConfig;
 

Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java (from r888993, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/RunStatsDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/RunStatsDataBean.java&r1=888993&r2=890405&rev=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/RunStatsDataBean.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java Mon Dec 14 17:12:27 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.core.spi;
+package org.apache.geronimo.samples.daytrader.beans;
 
 
 import java.io.Serializable;

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml Mon Dec 14 17:12:27 2009
@@ -49,6 +49,12 @@
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-tradeservices-interface</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
 <!--
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -102,6 +108,7 @@
                         <Import-Package>
                             org.apache.geronimo.samples.daytrader.beans;version=1.0,
                             org.apache.geronimo.samples.daytrader.util;version=1.0,
+                            org.apache.geronimo.samples.daytrader.spi;version=1.0,
                             javax.naming,
                             javax.sql
                             <!--javax.persistence;version=1.0.0,-->

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java Mon Dec 14 17:12:27 2009
@@ -20,10 +20,11 @@
 
 import javax.sql.DataSource;
 
-import org.apache.geronimo.samples.daytrader.beans.*;
-import org.apache.geronimo.samples.daytrader.core.spi.RunStatsDataBean;
+import org.apache.geronimo.samples.daytrader.beans.RunStatsDataBean;
+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 org.apache.geronimo.samples.daytrader.core.spi.TradeDBManager;
-import org.apache.geronimo.samples.daytrader.util.*;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java Mon Dec 14 17:12:27 2009
@@ -21,11 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.geronimo.samples.daytrader.beans.MarketSummaryDataBean;
 import org.apache.geronimo.samples.daytrader.util.Log;
 import org.apache.geronimo.samples.daytrader.util.TradeConfig;
-import org.apache.geronimo.samples.daytrader.core.spi.MarketSummaryDataBean;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServices;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeServicesManager;
+import org.apache.geronimo.samples.daytrader.spi.TradeServices;
 
 
 /**

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeDBManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeDBManager.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeDBManager.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeDBManager.java Mon Dec 14 17:12:27 2009
@@ -16,6 +16,7 @@
  */
 package org.apache.geronimo.samples.daytrader.core.spi;
 
+import org.apache.geronimo.samples.daytrader.beans.RunStatsDataBean;
 
 /**
   * TradeDBManager interface centralizes and simplifies the DB

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServiceUtilities.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServiceUtilities.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServiceUtilities.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServiceUtilities.java Mon Dec 14 17:12:27 2009
@@ -19,6 +19,7 @@
 
 import org.apache.geronimo.samples.daytrader.util.Log;
 import org.apache.geronimo.samples.daytrader.util.ServiceUtilities;
+import org.apache.geronimo.samples.daytrader.spi.TradeServices;
 
 
 /**

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServicesManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServicesManager.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServicesManager.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServicesManager.java Mon Dec 14 17:12:27 2009
@@ -19,6 +19,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.geronimo.samples.daytrader.beans.MarketSummaryDataBean;
+import org.apache.geronimo.samples.daytrader.spi.TradeServices;
+
 /**
   * TradeServicesManager interface provides an interface to be
   * used for managing the implementations of TradeServices that

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Dec 14 17:12:27 2009
@@ -15,7 +15,7 @@
   <service id="TradeDBManager" ref="tradeDBManagerBean" interface="org.apache.geronimo.samples.daytrader.core.spi.TradeDBManager">
   </service>
 
-  <reference-list id="tradeServicesList" availability="optional" interface="org.apache.geronimo.samples.daytrader.core.spi.TradeServices">
+  <reference-list id="tradeServicesList" availability="optional" interface="org.apache.geronimo.samples.daytrader.spi.TradeServices">
       <reference-listener ref="tradeServicesManagerBean" bind-method="bindService" unbind-method="unbindService" />
   </reference-list>
 

Added: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java?rev=890405&view=auto
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java (added)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java Mon Dec 14 17:12:27 2009
@@ -0,0 +1,239 @@
+/**
+ *  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.beans;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+
+import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
+import org.apache.geronimo.samples.daytrader.util.FinancialUtils;
+import org.apache.geronimo.samples.daytrader.util.Log;
+import org.apache.geronimo.samples.daytrader.util.TradeConfig;
+
+public class MarketSummaryDataBean implements Serializable
+{
+
+	private BigDecimal 	TSIA;			/* Trade Stock Index Average */
+	private BigDecimal 	openTSIA;		/* Trade Stock Index Average at the open */	
+	private double  	volume; 		/* volume of shares traded */
+	private Collection 	topGainers;		/* Collection of top gaining stocks */
+	private Collection 	topLosers;		/* Collection of top losing stocks */	
+	//FUTURE private Collection 	topVolume;		/* Collection of top stocks by volume */		
+	private Date			summaryDate;   /* Date this summary was taken */
+	
+	//cache the gainPercent once computed for this bean
+	private BigDecimal  gainPercent=null;
+
+	public MarketSummaryDataBean(){ }
+	public MarketSummaryDataBean(BigDecimal TSIA,
+							BigDecimal  openTSIA,
+							double		volume,
+							Collection 	topGainers,
+							Collection 	topLosers//, Collection topVolume
+							)
+	{
+		setTSIA(TSIA);
+		setOpenTSIA(openTSIA);
+		setVolume(volume);
+		setTopGainers(topGainers);
+		setTopLosers(topLosers);
+		setSummaryDate(new java.sql.Date(System.currentTimeMillis()));
+		gainPercent = FinancialUtils.computeGainPercent(getTSIA(), getOpenTSIA());
+		
+	}
+	
+	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()
+	{
+		String ret = "\n\tMarket Summary at: " + getSummaryDate()
+			+ "\n\t\t        TSIA:" + getTSIA()
+			+ "\n\t\t    openTSIA:" + getOpenTSIA()
+			+ "\n\t\t        gain:" + getGainPercent()
+			+ "\n\t\t      volume:" + getVolume()
+			;
+
+		if ( (getTopGainers()==null) || (getTopLosers()==null) )
+			return ret;
+		ret += "\n\t\t   Current Top Gainers:";
+		Iterator it = getTopGainers().iterator();
+		while ( it.hasNext() ) 
+		{
+			QuoteDataBean quoteData = (QuoteDataBean) it.next();
+			ret += ( "\n\t\t\t"  + quoteData.toString() );
+		}
+		ret += "\n\t\t   Current Top Losers:";
+		it = getTopLosers().iterator();
+		while ( it.hasNext() ) 
+		{
+			QuoteDataBean quoteData = (QuoteDataBean) it.next();
+			ret += ( "\n\t\t\t"  + quoteData.toString() );
+		}
+		return ret;		
+	}
+	public String toHTML()
+	{
+		String ret = "<BR>Market Summary at: " + getSummaryDate()
+			+ "<LI>        TSIA:" + getTSIA() + "</LI>"
+			+ "<LI>    openTSIA:" + getOpenTSIA() + "</LI>"
+			+ "<LI>      volume:" + getVolume() + "</LI>"
+			;
+		if ( (getTopGainers()==null) || (getTopLosers()==null) )
+			return ret;
+		ret += "<BR> Current Top Gainers:";
+		Iterator it = getTopGainers().iterator();
+		while ( it.hasNext() ) 
+		{
+			QuoteDataBean quoteData = (QuoteDataBean) it.next();
+			ret += ( "<LI>"  + quoteData.toString()  + "</LI>" );
+		}
+		ret += "<BR>   Current Top Losers:";
+		it = getTopLosers().iterator();
+		while ( it.hasNext() ) 
+		{
+			QuoteDataBean quoteData = (QuoteDataBean) it.next();
+			ret += ( "<LI>"  + quoteData.toString()  + "</LI>" );
+		}
+		return ret;
+	}
+	public void print()
+	{
+		Log.log( this.toString() );
+	}	
+	
+	public BigDecimal getGainPercent()
+	{
+		if ( gainPercent == null )
+			gainPercent = FinancialUtils.computeGainPercent(getTSIA(), getOpenTSIA());
+		return gainPercent;
+	}
+
+
+	/**
+	 * Gets the tSIA
+	 * @return Returns a BigDecimal
+	 */
+	public BigDecimal getTSIA() {
+		return TSIA;
+	}
+	/**
+	 * Sets the tSIA
+	 * @param tSIA The tSIA to set
+	 */
+	public void setTSIA(BigDecimal tSIA) {
+		TSIA = tSIA;
+	}
+
+	/**
+	 * Gets the openTSIA
+	 * @return Returns a BigDecimal
+	 */
+	public BigDecimal getOpenTSIA() {
+		return openTSIA;
+	}
+	/**
+	 * Sets the openTSIA
+	 * @param openTSIA The openTSIA to set
+	 */
+	public void setOpenTSIA(BigDecimal openTSIA) {
+		this.openTSIA = openTSIA;
+	}
+
+	/**
+	 * Gets the volume
+	 * @return Returns a BigDecimal
+	 */
+	public double getVolume() {
+		return volume;
+	}
+	/**
+	 * Sets the volume
+	 * @param volume The volume to set
+	 */
+	public void setVolume(double volume) {
+		this.volume = volume;
+	}
+
+	/**
+	 * Gets the topGainers
+	 * @return Returns a Collection
+	 */
+	public Collection getTopGainers() {
+		return topGainers;
+	}
+	/**
+	 * Sets the topGainers
+	 * @param topGainers The topGainers to set
+	 */
+	public void setTopGainers(Collection topGainers) {
+		this.topGainers = topGainers;
+	}
+
+	/**
+	 * Gets the topLosers
+	 * @return Returns a Collection
+	 */
+	public Collection getTopLosers() {
+		return topLosers;
+	}
+	/**
+	 * Sets the topLosers
+	 * @param topLosers The topLosers to set
+	 */
+	public void setTopLosers(Collection topLosers) {
+		this.topLosers = topLosers;
+	}
+
+	/**
+	 * Gets the summaryDate
+	 * @return Returns a Date
+	 */
+	public Date getSummaryDate() {
+		return summaryDate;
+	}
+	/**
+	 * Sets the summaryDate
+	 * @param summaryDate The summaryDate to set
+	 */
+	public void setSummaryDate(Date summaryDate) {
+		this.summaryDate = summaryDate;
+	}
+
+}

Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/MarketSummaryDataBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java?rev=890405&view=auto
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java (added)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java Mon Dec 14 17:12:27 2009
@@ -0,0 +1,255 @@
+/**
+ *  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.beans;
+
+
+import java.io.Serializable;
+
+public class RunStatsDataBean implements Serializable
+{
+	//Constructors
+	public RunStatsDataBean(){ }
+
+	// count of trade users in the database (users w/ userID like 'uid:%')
+	private int tradeUserCount;
+	// count of trade stocks in the database (stocks w/ symbol like 's:%')
+	private int tradeStockCount;
+	
+	// count of new registered users in this run (users w/ userID like 'ru:%') -- random user
+	private int newUserCount;
+	
+	// sum of logins by trade users
+	private int sumLoginCount;
+	// sum of logouts by trade users	
+	private int sumLogoutCount;
+
+	// count of holdings of trade users	
+	private int holdingCount;
+
+	// count of orders of trade users		
+	private int orderCount;	
+	// count of buy orders of trade users			
+	private int buyOrderCount;
+	// count of sell orders of trade users			
+	private int sellOrderCount;
+	// count of cancelled orders of trade users			
+	private int cancelledOrderCount;
+	// count of open orders of trade users			
+	private int openOrderCount;
+	// count of orders deleted during this trade Reset
+	private int deletedOrderCount;
+
+	public String toString()
+	{
+		return "\n\tRunStatsData for reset at " + new java.util.Date()
+			+ "\n\t\t      tradeUserCount: " + getTradeUserCount()
+			+ "\n\t\t        newUserCount: " + getNewUserCount()
+			+ "\n\t\t       sumLoginCount: " + getSumLoginCount()
+			+ "\n\t\t      sumLogoutCount: " + getSumLogoutCount()
+			+ "\n\t\t        holdingCount: " + getHoldingCount()
+			+ "\n\t\t          orderCount: " + getOrderCount()
+			+ "\n\t\t       buyOrderCount: " + getBuyOrderCount()
+			+ "\n\t\t      sellOrderCount: " + getSellOrderCount()
+			+ "\n\t\t cancelledOrderCount: " + getCancelledOrderCount()
+			+ "\n\t\t      openOrderCount: " + getOpenOrderCount()
+			+ "\n\t\t   deletedOrderCount: " + getDeletedOrderCount()
+			;
+	}
+
+
+	/**
+	 * Gets the tradeUserCount
+	 * @return Returns a int
+	 */
+	public int getTradeUserCount() {
+		return tradeUserCount;
+	}
+	/**
+	 * Sets the tradeUserCount
+	 * @param tradeUserCount The tradeUserCount to set
+	 */
+	public void setTradeUserCount(int tradeUserCount) {
+		this.tradeUserCount = tradeUserCount;
+	}
+
+	/**
+	 * Gets the newUserCount
+	 * @return Returns a int
+	 */
+	public int getNewUserCount() {
+		return newUserCount;
+	}
+	/**
+	 * Sets the newUserCount
+	 * @param newUserCount The newUserCount to set
+	 */
+	public void setNewUserCount(int newUserCount) {
+		this.newUserCount = newUserCount;
+	}
+
+	/**
+	 * Gets the sumLoginCount
+	 * @return Returns a int
+	 */
+	public int getSumLoginCount() {
+		return sumLoginCount;
+	}
+	/**
+	 * Sets the sumLoginCount
+	 * @param sumLoginCount The sumLoginCount to set
+	 */
+	public void setSumLoginCount(int sumLoginCount) {
+		this.sumLoginCount = sumLoginCount;
+	}
+
+	/**
+	 * Gets the sumLogoutCount
+	 * @return Returns a int
+	 */
+	public int getSumLogoutCount() {
+		return sumLogoutCount;
+	}
+	/**
+	 * Sets the sumLogoutCount
+	 * @param sumLogoutCount The sumLogoutCount to set
+	 */
+	public void setSumLogoutCount(int sumLogoutCount) {
+		this.sumLogoutCount = sumLogoutCount;
+	}
+
+	/**
+	 * Gets the holdingCount
+	 * @return Returns a int
+	 */
+	public int getHoldingCount() {
+		return holdingCount;
+	}
+	/**
+	 * Sets the holdingCount
+	 * @param holdingCount The holdingCount to set
+	 */
+	public void setHoldingCount(int holdingCount) {
+		this.holdingCount = holdingCount;
+	}
+
+	/**
+	 * Gets the buyOrderCount
+	 * @return Returns a int
+	 */
+	public int getBuyOrderCount() {
+		return buyOrderCount;
+	}
+	/**
+	 * Sets the buyOrderCount
+	 * @param buyOrderCount The buyOrderCount to set
+	 */
+	public void setBuyOrderCount(int buyOrderCount) {
+		this.buyOrderCount = buyOrderCount;
+	}
+
+	/**
+	 * Gets the sellOrderCount
+	 * @return Returns a int
+	 */
+	public int getSellOrderCount() {
+		return sellOrderCount;
+	}
+	/**
+	 * Sets the sellOrderCount
+	 * @param sellOrderCount The sellOrderCount to set
+	 */
+	public void setSellOrderCount(int sellOrderCount) {
+		this.sellOrderCount = sellOrderCount;
+	}
+
+	/**
+	 * Gets the cancelledOrderCount
+	 * @return Returns a int
+	 */
+	public int getCancelledOrderCount() {
+		return cancelledOrderCount;
+	}
+	/**
+	 * Sets the cancelledOrderCount
+	 * @param cancelledOrderCount The cancelledOrderCount to set
+	 */
+	public void setCancelledOrderCount(int cancelledOrderCount) {
+		this.cancelledOrderCount = cancelledOrderCount;
+	}
+
+	/**
+	 * Gets the openOrderCount
+	 * @return Returns a int
+	 */
+	public int getOpenOrderCount() {
+		return openOrderCount;
+	}
+	/**
+	 * Sets the openOrderCount
+	 * @param openOrderCount The openOrderCount to set
+	 */
+	public void setOpenOrderCount(int openOrderCount) {
+		this.openOrderCount = openOrderCount;
+	}
+
+	/**
+	 * Gets the deletedOrderCount
+	 * @return Returns a int
+	 */
+	public int getDeletedOrderCount() {
+		return deletedOrderCount;
+	}
+	/**
+	 * Sets the deletedOrderCount
+	 * @param deletedOrderCount The deletedOrderCount to set
+	 */
+	public void setDeletedOrderCount(int deletedOrderCount) {
+		this.deletedOrderCount = deletedOrderCount;
+	}
+
+	/**
+	 * Gets the orderCount
+	 * @return Returns a int
+	 */
+	public int getOrderCount() {
+		return orderCount;
+	}
+	/**
+	 * Sets the orderCount
+	 * @param orderCount The orderCount to set
+	 */
+	public void setOrderCount(int orderCount) {
+		this.orderCount = orderCount;
+	}
+
+	/**
+	 * Gets the tradeStockCount
+	 * @return Returns a int
+	 */
+	public int getTradeStockCount() {
+		return tradeStockCount;
+	}
+	/**
+	 * Sets the tradeStockCount
+	 * @param tradeStockCount The tradeStockCount to set
+	 */
+	public void setTradeStockCount(int tradeStockCount) {
+		this.tradeStockCount = tradeStockCount;
+	}
+
+}
+

Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/RunStatsDataBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml Mon Dec 14 17:12:27 2009
@@ -30,7 +30,6 @@
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
        
         <properties>
-            <property name="openjpa.jdbc.DBDictionary" value="derby" />
             <property name="openjpa.BrokerImpl" value="non-finalizing" /> 
             <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
             <property name="openjpa.jdbc.UpdateManager" value="com.ibm.ws.persistence.jdbc.kernel.OperationOrderUpdateManager(batchLimit=0)" /> 
@@ -39,6 +38,7 @@
         
         <!-- 
         <properties>
+        <property name="openjpa.jdbc.DBDictionary" value="derby" />
         <property name="openjpa.ConnectionProperties" value="DriverClassName=com.ibm.db2.jcc.DB2Driver,URL=jdbc:db2://9.12.24.171:50000/TRADE61,MaxActive=50,MaxWait=10000,Username=db2inst1,Password=db2inst1"/>
         <property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource"/>
         <property name="openjpa.jdbc.DBDictionary" value="db2(batchLimit=600)"/>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml Mon Dec 14 17:12:27 2009
@@ -43,14 +43,6 @@
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-beans</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
--->
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-entities</artifactId>
@@ -59,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-core</artifactId>
+            <artifactId>daytrader-tradeservices-interface</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -123,7 +115,7 @@
                         <Import-Package>
                             org.apache.geronimo.samples.daytrader.beans;version=1.0,
                             org.apache.geronimo.samples.daytrader.util;version=1.0,
-                            org.apache.geronimo.samples.daytrader.core.spi;version=1.0,
+                            org.apache.geronimo.samples.daytrader.spi;version=1.0,
                             javax.naming,
                             javax.sql
                             <!--javax.persistence;version=1.0.0,-->

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java Mon Dec 14 17:12:27 2009
@@ -23,11 +23,16 @@
 
 import javax.sql.DataSource;
 
-import org.apache.geronimo.samples.daytrader.beans.*;
-import org.apache.geronimo.samples.daytrader.core.spi.FinancialUtils;
-import org.apache.geronimo.samples.daytrader.core.spi.MarketSummaryDataBean;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServices;
-import org.apache.geronimo.samples.daytrader.util.*;
+import org.apache.geronimo.samples.daytrader.beans.AccountDataBean;
+import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean;
+import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.beans.MarketSummaryDataBean;
+import org.apache.geronimo.samples.daytrader.beans.OrderDataBean;
+import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
+import org.apache.geronimo.samples.daytrader.spi.TradeServices;
+import org.apache.geronimo.samples.daytrader.util.FinancialUtils;
+import org.apache.geronimo.samples.daytrader.util.Log;
+import org.apache.geronimo.samples.daytrader.util.TradeConfig;
 
 import java.rmi.RemoteException;
 import java.sql.Connection;
@@ -83,7 +88,6 @@
     }
 
     public TradeJDBCDirect(boolean inSession) {
-
         this.inSession = inSession;
     }
 
@@ -98,7 +102,6 @@
      * @see TradeServices#getMarketSummary()
      */
     public MarketSummaryDataBean getMarketSummary() throws Exception {
-
         MarketSummaryDataBean marketSummaryData = null;
         Connection conn = null;
 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Dec 14 17:12:27 2009
@@ -7,7 +7,7 @@
       <!--<property name="inSession" value="true"/>-->
   </bean>
 
-  <service id="tradeServicesJDBC" ref="tradeServicesBeanJDBC" interface="org.apache.geronimo.samples.daytrader.core.spi.TradeServices">
+  <service id="tradeServicesJDBC" ref="tradeServicesBeanJDBC" interface="org.apache.geronimo.samples.daytrader.spi.TradeServices">
       <service-properties>
           <entry key="mode" value="jdbc"/>
       </service-properties>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml Mon Dec 14 17:12:27 2009
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-core</artifactId>
+            <artifactId>daytrader-tradeservices-interface</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -113,7 +113,7 @@
                         <Import-Package>
                             org.apache.geronimo.samples.daytrader.beans;version=1.0,
                             org.apache.geronimo.samples.daytrader.util;version=1.0,
-                            org.apache.geronimo.samples.daytrader.core.spi;version=1.0,
+                            org.apache.geronimo.samples.daytrader.spi;version=1.0,
                             javax.naming,
                             javax.sql,
                             javax.persistence;version=1.0.0,

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java Mon Dec 14 17:12:27 2009
@@ -29,11 +29,11 @@
 import org.apache.geronimo.samples.daytrader.beans.AccountDataBean;
 import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean;
 import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.beans.MarketSummaryDataBean;
 import org.apache.geronimo.samples.daytrader.beans.OrderDataBean;
 import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
-import org.apache.geronimo.samples.daytrader.core.spi.FinancialUtils;
-import org.apache.geronimo.samples.daytrader.core.spi.MarketSummaryDataBean;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServices;
+import org.apache.geronimo.samples.daytrader.spi.TradeServices;
+import org.apache.geronimo.samples.daytrader.util.FinancialUtils;
 import org.apache.geronimo.samples.daytrader.util.Log;
 import org.apache.geronimo.samples.daytrader.util.TradeConfig;
 
@@ -454,7 +454,6 @@
         }
         catch (Exception e) {
             Log.error("TradeJPADirect:createQuote -- exception creating Quote", e);
-            System.out.println("TradeJPADirect:createQuote -- exception creating Quote");
             throw new RuntimeException(e);
         }
     }

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Dec 14 17:12:27 2009
@@ -6,7 +6,7 @@
   <bean id="tradeServicesBeanJPA" class="org.apache.geronimo.samples.daytrader.persist.jpa.TradeJPADirect" init-method="init"> 
   </bean>
   
-  <service id="tradeServicesJPA" ref="tradeServicesBeanJPA" interface="org.apache.geronimo.samples.daytrader.core.spi.TradeServices">
+  <service id="tradeServicesJPA" ref="tradeServicesBeanJPA" interface="org.apache.geronimo.samples.daytrader.spi.TradeServices">
       <service-properties>
           <entry key="mode" value="jpa"/>
       </service-properties>

Added: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml?rev=890405&view=auto
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml (added)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml Mon Dec 14 17:12:27 2009
@@ -0,0 +1,73 @@
+<?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>1.0.0</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.daytrader.modules</groupId>
+    <artifactId>daytrader-tradeservices-interface</artifactId>
+    <packaging>bundle</packaging>
+    <name>DayTrader :: Modules - TradeServices Interface</name>
+    <description>Daytrader TradeServices Interface</description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/tradeServices</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/tradeServices</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/tradeServices</url>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-beans</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.geronimo.samples.daytrader.spi;version=1.0.0
+                        </Export-Package>
+                        <Import-Package>
+                            org.apache.geronimo.samples.daytrader.core.spi;version=1.0,
+                            org.apache.geronimo.samples.daytrader.beans;version=1.0
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/geronimo/samples/daytrader/spi/TradeServices.java (from r888993, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServices.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/geronimo/samples/daytrader/spi/TradeServices.java?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/geronimo/samples/daytrader/spi/TradeServices.java&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServices.java&r1=888993&r2=890405&rev=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServices.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/src/main/java/org/apache/geronimo/samples/daytrader/spi/TradeServices.java Mon Dec 14 17:12:27 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.core.spi;
+package org.apache.geronimo.samples.daytrader.spi;
 
 
 import java.math.BigDecimal;
@@ -25,6 +25,7 @@
 import org.apache.geronimo.samples.daytrader.beans.AccountDataBean;
 import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean;
 import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.beans.MarketSummaryDataBean;
 import org.apache.geronimo.samples.daytrader.beans.OrderDataBean;
 import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
 

Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/FinancialUtils.java (from r889746, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/FinancialUtils.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/FinancialUtils.java?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/FinancialUtils.java&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/FinancialUtils.java&r1=889746&r2=890405&rev=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/FinancialUtils.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/FinancialUtils.java Mon Dec 14 17:12:27 2009
@@ -14,101 +14,88 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.core.spi;
+package org.apache.geronimo.samples.daytrader.util;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.math.BigDecimal;
 
-import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
-
 public class FinancialUtils {
-	//TODO -- FinancialUtils should have parts reimplemented as JSPTaglibs 
+    //TODO -- FinancialUtils should have parts reimplemented as JSPTaglibs 
+
+    public final static int ROUND = BigDecimal.ROUND_HALF_UP;
+    public final static int SCALE = 2;  
+    public final static BigDecimal ZERO = (new BigDecimal(0.00)).setScale(SCALE);
+    public final static BigDecimal ONE = (new BigDecimal(1.00)).setScale(SCALE);
+    public final static BigDecimal HUNDRED = (new BigDecimal(100.00)).setScale(SCALE);
+
+    public static BigDecimal computeGain(BigDecimal currentBalance,
+                                         BigDecimal openBalance) 
+    {
+        return currentBalance.subtract(openBalance).setScale(SCALE);
+    }
+
+    public static BigDecimal computeGainPercent(BigDecimal currentBalance,
+                                                BigDecimal openBalance) 
+    {
+        if (openBalance.doubleValue() == 0.0) return ZERO;
+        BigDecimal gainPercent =
+        currentBalance.divide(openBalance, ROUND).subtract(ONE).multiply(HUNDRED);
+        return gainPercent;
+    }
+
+    public static String printGainHTML(BigDecimal gain) {
+        String htmlString, arrow;
+        if (gain.doubleValue() < 0.0) {
+            htmlString = "<FONT color=\"#ff0000\">";
+            arrow = "arrowdown.gif";
+        }
+        else {
+            htmlString = "<FONT color=\"#009900\">";
+            arrow = "arrowup.gif";          
+        }
 
-	public final static int ROUND = BigDecimal.ROUND_HALF_UP;
-	public final static int SCALE = 2;	
-	public final static BigDecimal ZERO = (new BigDecimal(0.00)).setScale(SCALE);
-	public final static BigDecimal ONE = (new BigDecimal(1.00)).setScale(SCALE);
-	public final static BigDecimal HUNDRED = (new BigDecimal(100.00)).setScale(SCALE);
-
-	public static BigDecimal computeGain(BigDecimal currentBalance,
-											BigDecimal openBalance) 
-	{
-		return currentBalance.subtract(openBalance).setScale(SCALE);
-	}
-	
-	public static BigDecimal computeGainPercent(BigDecimal currentBalance,
-												BigDecimal openBalance) 
-	{
-		if (openBalance.doubleValue() == 0.0) return ZERO;
-		BigDecimal gainPercent =
-			currentBalance.divide(openBalance, ROUND).subtract(ONE).multiply(HUNDRED);
-		return gainPercent;
-	}
-
-	public static BigDecimal computeHoldingsTotal(Collection holdingDataBeans) {
-		BigDecimal holdingsTotal = new BigDecimal(0.0).setScale(SCALE);
-		if (holdingDataBeans == null)
-			return holdingsTotal;
-		Iterator it = holdingDataBeans.iterator();
-		while (it.hasNext()) {
-			HoldingDataBean holdingData = (HoldingDataBean) it.next();
-			BigDecimal total =
-				holdingData.getPurchasePrice().multiply(new BigDecimal(holdingData.getQuantity()));
-			holdingsTotal = holdingsTotal.add(total);
-		}
-		return holdingsTotal.setScale(SCALE);
-	}
-
-	public static String printGainHTML(BigDecimal gain) {
-		String htmlString, arrow;
-		if (gain.doubleValue() < 0.0) {
-			htmlString = "<FONT color=\"#ff0000\">";
-			arrow = "arrowdown.gif";
-		} else {
-			htmlString = "<FONT color=\"#009900\">";
-			arrow = "arrowup.gif";			
-		}
-
-		htmlString += gain.setScale(SCALE, ROUND) + "</FONT><IMG src=\"images/" + arrow + "\" width=\"10\" height=\"10\" border=\"0\"></IMG>";
-		return htmlString;
-	}
-
-	public static String printChangeHTML(double change) {
-		String htmlString, arrow;
-		if (change < 0.0) {
-			htmlString = "<FONT color=\"#ff0000\">";
-			arrow = "arrowdown.gif";						
-		} else {
-			htmlString = "<FONT color=\"#009900\">";
-			arrow = "arrowup.gif";						
-		}
-
-
-		htmlString += change + "</FONT><IMG src=\"images/" + arrow + "\" width=\"10\" height=\"10\" border=\"0\"></IMG>";
-		return htmlString;
-	}
-
-	public static String printGainPercentHTML(BigDecimal gain) {
-		String htmlString, arrow;
-		if (gain.doubleValue() < 0.0) {
-			htmlString = "(<B><FONT color=\"#ff0000\">";
-			arrow = "arrowdown.gif";									
-		} else {
-			htmlString = "(<B><FONT color=\"#009900\">+";
-			arrow = "arrowup.gif";									
-		}
-
-		htmlString += gain.setScale(SCALE, ROUND);
-		htmlString += "%</FONT></B>)<IMG src=\"images/" + arrow + "\" width=\"10\" height=\"10\" border=\"0\"></IMG>";
-		return htmlString;
-	}
-	
-    public static String printQuoteLink(String symbol)	
+        htmlString += gain.setScale(SCALE, ROUND) + "</FONT><IMG src=\"images/" + arrow + "\" width=\"10\" height=\"10\" border=\"0\"></IMG>";
+        return htmlString;
+    }
+
+    public static String printChangeHTML(double change) {
+        String htmlString, arrow;
+        if (change < 0.0) {
+            htmlString = "<FONT color=\"#ff0000\">";
+            arrow = "arrowdown.gif";                        
+        }
+        else {
+            htmlString = "<FONT color=\"#009900\">";
+            arrow = "arrowup.gif";                      
+        }
+
+
+        htmlString += change + "</FONT><IMG src=\"images/" + arrow + "\" width=\"10\" height=\"10\" border=\"0\"></IMG>";
+        return htmlString;
+    }
+
+    public static String printGainPercentHTML(BigDecimal gain) {
+        String htmlString, arrow;
+        if (gain.doubleValue() < 0.0) {
+            htmlString = "(<B><FONT color=\"#ff0000\">";
+            arrow = "arrowdown.gif";                                    
+        }
+        else {
+            htmlString = "(<B><FONT color=\"#009900\">+";
+            arrow = "arrowup.gif";                                  
+        }
+
+        htmlString += gain.setScale(SCALE, ROUND);
+        htmlString += "%</FONT></B>)<IMG src=\"images/" + arrow + "\" width=\"10\" height=\"10\" border=\"0\"></IMG>";
+        return htmlString;
+    }
+
+    public static String printQuoteLink(String symbol)  
     {
-    	String htmlString;
-    	return "<A href=\"app?action=quotes&symbols="+ symbol+"\">" + symbol + "</A>";
+        String htmlString;
+        return "<A href=\"app?action=quotes&symbols="+ symbol+"\">" + symbol + "</A>";
     }
-	
+
 
 }
\ No newline at end of file

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml Mon Dec 14 17:12:27 2009
@@ -55,6 +55,12 @@
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-tradeservices-interface</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
 <!--
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java Mon Dec 14 17:12:27 2009
@@ -20,9 +20,9 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServices;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeServicesManager;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.spi.TradeServices;
 import org.apache.geronimo.samples.daytrader.util.*;
 
 public class OrdersAlertFilter implements Filter {

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TestServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TestServlet.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TestServlet.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TestServlet.java Mon Dec 14 17:12:27 2009
@@ -19,9 +19,9 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServices;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeServicesManager;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.spi.TradeServices;
 import org.apache.geronimo.samples.daytrader.util.*;
 
 import java.io.IOException;

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java Mon Dec 14 17:12:27 2009
@@ -19,9 +19,9 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServices;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeServicesManager;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.spi.TradeServices;
 import org.apache.geronimo.samples.daytrader.util.*;
 
 import java.io.IOException;

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java?rev=890405&r1=890404&r2=890405&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java Mon Dec 14 17:12:27 2009
@@ -23,11 +23,11 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 
+import org.apache.geronimo.samples.daytrader.beans.*;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeDBManager;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServices;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeServicesManager;
 import org.apache.geronimo.samples.daytrader.core.spi.TradeServiceUtilities;
-import org.apache.geronimo.samples.daytrader.beans.*;
+import org.apache.geronimo.samples.daytrader.spi.TradeServices;
 import org.apache.geronimo.samples.daytrader.util.*;
 
 /**



Mime
View raw message