You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2010/01/12 18:05:14 UTC

svn commit: r898421 - in /geronimo/sandbox/jbohn/daytrader-bp-new/modules: daytrader-api/ daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/ daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/spi/ daytrader-core/ dayt...

Author: jbohn
Date: Tue Jan 12 17:05:11 2010
New Revision: 898421

URL: http://svn.apache.org/viewvc?rev=898421&view=rev
Log:
centralize interfaces and a few utility classes in the api bundle

Added:
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/
      - copied from r898363, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/spi/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeDBManager.java
      - copied, changed from r898362, 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-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServiceUtilities.java
      - copied, changed from r898362, 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-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServicesManager.java
      - copied, changed from r898362, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServicesManager.java
Removed:
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/spi/
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/
Modified:
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServices.java
    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/resources/OSGI-INF/blueprint/blueprint.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/daytrader-web/src/main/resources/account.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/accountImg.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/order.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/orderImg.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolio.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolioImg.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quote.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quoteImg.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/runStats.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehome.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehomeImg.jsp

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/pom.xml?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/pom.xml Tue Jan 12 17:05:11 2010
@@ -33,6 +33,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-util</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-entities</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
@@ -60,11 +66,12 @@
                         <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${pom.version}</Bundle-Version>
                         <Export-Package>
-                            org.apache.geronimo.samples.daytrader.spi;version=1.0.0
+                            org.apache.geronimo.samples.daytrader.api;version=1.0.0
                         </Export-Package>
                         <Import-Package>
-                            org.apache.geronimo.samples.daytrader.spi;version=1.0,
-                            org.apache.geronimo.samples.daytrader.beans;version=1.0
+                            <!--org.apache.geronimo.samples.daytrader.api;version=1.0,-->
+                            org.apache.geronimo.samples.daytrader.beans;version=1.0,
+                            org.apache.geronimo.samples.daytrader.util;version=1.0
                         </Import-Package>
                     </instructions>
                 </configuration>

Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeDBManager.java (from r898362, 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-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeDBManager.java?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeDBManager.java&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeDBManager.java&r1=898362&r2=898421&rev=898421&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-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeDBManager.java Tue Jan 12 17:05:11 2010
@@ -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.api;
 
 import org.apache.geronimo.samples.daytrader.beans.RunStatsDataBean;
 

Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServiceUtilities.java (from r898362, 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-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServiceUtilities.java?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServiceUtilities.java&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServiceUtilities.java&r1=898362&r2=898421&rev=898421&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-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServiceUtilities.java Tue Jan 12 17:05:11 2010
@@ -15,11 +15,10 @@
  *  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.api;
 
 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-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServices.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServices.java?rev=898421&r1=898363&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServices.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServices.java Tue Jan 12 17:05:11 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.samples.daytrader.spi;
+package org.apache.geronimo.samples.daytrader.api;
 
 
 import java.math.BigDecimal;

Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServicesManager.java (from r898362, 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-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServicesManager.java?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServicesManager.java&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/spi/TradeServicesManager.java&r1=898362&r2=898421&rev=898421&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-api/src/main/java/org/apache/geronimo/samples/daytrader/api/TradeServicesManager.java Tue Jan 12 17:05:11 2010
@@ -14,13 +14,12 @@
  *  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.api;
 
 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

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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -67,13 +67,12 @@
                         <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${pom.version}</Bundle-Version>
                         <Export-Package>
-                            org.apache.geronimo.samples.daytrader.core.spi;version=1.0.0
+                            <!--org.apache.geronimo.samples.daytrader.core.spi;version=1.0.0-->
                         </Export-Package>
                         <Import-Package>
-                            org.apache.geronimo.samples.daytrader.core.spi;version=1.0,
+                            org.apache.geronimo.samples.daytrader.api;version=1.0,
                             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
                         </Import-Package>

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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -24,7 +24,7 @@
 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.api.TradeDBManager;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -40,7 +40,7 @@
  * implementations.
  * 
  * @see
- *      org.apache.geronimo.samples.daytrader.core.spi.TradeDBManager
+ *      org.apache.geronimo.samples.daytrader.api.TradeDBManager
  */
 
 public class TradeDBManagerImpl implements TradeDBManager {

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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -24,8 +24,8 @@
 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.TradeServicesManager;
-import org.apache.geronimo.samples.daytrader.spi.TradeServices;
+import org.apache.geronimo.samples.daytrader.api.TradeServicesManager;
+import org.apache.geronimo.samples.daytrader.api.TradeServices;
 
 
 /**

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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -7,15 +7,15 @@
       <property name="tradeServicesList" ref="tradeServicesList"/>
   </bean>
 
-  <service id="TradeServicesManager" ref="tradeServicesManagerBean" interface="org.apache.geronimo.samples.daytrader.core.spi.TradeServicesManager"/>
+  <service id="TradeServicesManager" ref="tradeServicesManagerBean" interface="org.apache.geronimo.samples.daytrader.api.TradeServicesManager"/>
   
   <bean id="tradeDBManagerBean" class="org.apache.geronimo.samples.daytrader.core.TradeDBManagerImpl" init-method="init">
   </bean>
 
-  <service id="TradeDBManager" ref="tradeDBManagerBean" interface="org.apache.geronimo.samples.daytrader.core.spi.TradeDBManager">
+  <service id="TradeDBManager" ref="tradeDBManagerBean" interface="org.apache.geronimo.samples.daytrader.api.TradeDBManager">
   </service>
 
-  <reference-list id="tradeServicesList" availability="optional" interface="org.apache.geronimo.samples.daytrader.spi.TradeServices">
+  <reference-list id="tradeServicesList" availability="optional" interface="org.apache.geronimo.samples.daytrader.api.TradeServices">
       <reference-listener ref="tradeServicesManagerBean" bind-method="bindService" unbind-method="unbindService" />
   </reference-list>
 

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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -77,7 +77,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,
+                            org.apache.geronimo.samples.daytrader.api;version=1.0,
                             javax.naming,
                             javax.sql
                         </Import-Package>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java?rev=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -29,7 +29,7 @@
 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.api.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;

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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -7,7 +7,7 @@
       <!--<property name="inSession" value="true"/>-->
   </bean>
 
-  <service id="tradeServicesJDBC" ref="tradeServicesBeanJDBC" interface="org.apache.geronimo.samples.daytrader.spi.TradeServices">
+  <service id="tradeServicesJDBC" ref="tradeServicesBeanJDBC" interface="org.apache.geronimo.samples.daytrader.api.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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -77,7 +77,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,
+                            org.apache.geronimo.samples.daytrader.api;version=1.0,
                             javax.persistence;version=1.0.0
                         </Import-Package>
                         <Private-Package>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJPADirect.java?rev=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -32,7 +32,7 @@
 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.api.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;

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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -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.spi.TradeServices">
+  <service id="tradeServicesJPA" ref="tradeServicesBeanJPA" interface="org.apache.geronimo.samples.daytrader.api.TradeServices">
       <service-properties>
           <entry key="mode" value="jpa"/>
       </service-properties>

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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -112,8 +112,7 @@
                   <Web-JSPExtractLocation>/</Web-JSPExtractLocation>
                   <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.api;version=1.0,
                       org.apache.geronimo.samples.daytrader.util;version=1.0,
                       javax.naming, 
                       javax.servlet, 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -20,9 +20,9 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-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.api.TradeServicesManager;
+import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.api.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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -19,9 +19,9 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-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.api.TradeServicesManager;
+import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.api.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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -19,9 +19,9 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-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.api.TradeServicesManager;
+import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.api.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=898421&r1=898420&r2=898421&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 Tue Jan 12 17:05:11 2010
@@ -24,10 +24,10 @@
 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.TradeServicesManager;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServiceUtilities;
-import org.apache.geronimo.samples.daytrader.spi.TradeServices;
+import org.apache.geronimo.samples.daytrader.api.TradeDBManager;
+import org.apache.geronimo.samples.daytrader.api.TradeServicesManager;
+import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.api.TradeServices;
 import org.apache.geronimo.samples.daytrader.util.*;
 
 /**

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java Tue Jan 12 17:05:11 2010
@@ -20,8 +20,8 @@
 import javax.servlet.http.*;
 
 import org.apache.geronimo.samples.daytrader.beans.RunStatsDataBean;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeDBManager;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.api.TradeDBManager;
+import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
 import org.apache.geronimo.samples.daytrader.util.Log;
 import org.apache.geronimo.samples.daytrader.util.TradeConfig;
 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java Tue Jan 12 17:05:11 2010
@@ -23,8 +23,8 @@
 import javax.servlet.http.*;
 
 import org.apache.geronimo.samples.daytrader.beans.*;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServiceUtilities;
-import org.apache.geronimo.samples.daytrader.spi.TradeServices;
+import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.api.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/prims/PingJDBCRead.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCRead.java?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCRead.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCRead.java Tue Jan 12 17:05:11 2010
@@ -21,8 +21,8 @@
 import javax.servlet.http.*;
 
 import org.apache.geronimo.samples.daytrader.beans.*;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServiceUtilities;
-import org.apache.geronimo.samples.daytrader.spi.TradeServices;
+import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.api.TradeServices;
 import org.apache.geronimo.samples.daytrader.util.*;
 
 /**

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java Tue Jan 12 17:05:11 2010
@@ -22,8 +22,8 @@
 import javax.servlet.http.*;
 
 import org.apache.geronimo.samples.daytrader.beans.*;
-import org.apache.geronimo.samples.daytrader.core.spi.TradeServiceUtilities;
-import org.apache.geronimo.samples.daytrader.spi.TradeServices;
+import org.apache.geronimo.samples.daytrader.api.TradeServiceUtilities;
+import org.apache.geronimo.samples.daytrader.api.TradeServices;
 import org.apache.geronimo.samples.daytrader.util.*;
 
 /**

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/account.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/account.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/account.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/account.jsp Tue Jan 12 17:05:11 2010
@@ -23,7 +23,7 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.core.spi.*,org.apache.geronimo.samples.daytrader.beans.*,org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.api.*,org.apache.geronimo.samples.daytrader.beans.*,org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="accountData"

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/accountImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/accountImg.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/accountImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/accountImg.jsp Tue Jan 12 17:05:11 2010
@@ -23,7 +23,7 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="accountData"

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp Tue Jan 12 17:05:11 2010
@@ -21,7 +21,7 @@
 <TITLE>Welcome to DayTrader</TITLE>
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099">
-<%@ page import="java.util.ArrayList, org.apache.geronimo.samples.daytrader.util.TradeConfig, org.apache.geronimo.samples.daytrader.core.spi.*"
+<%@ page import="java.util.ArrayList, org.apache.geronimo.samples.daytrader.util.TradeConfig, org.apache.geronimo.samples.daytrader.api.*"
 	session="false" isThreadSafe="true" isErrorPage="false"%>
 
 <% 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp Tue Jan 12 17:05:11 2010
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ page
-	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.*"
+	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <% 
     String symbol = request.getParameter("symbol");

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp Tue Jan 12 17:05:11 2010
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <%@ page
-	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.*"
+	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <%

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/order.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/order.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/order.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/order.jsp Tue Jan 12 17:05:11 2010
@@ -22,7 +22,7 @@
 
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 
 <TABLE height="54">

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/orderImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/orderImg.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/orderImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/orderImg.jsp Tue Jan 12 17:05:11 2010
@@ -22,7 +22,7 @@
 
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 
 <TABLE height="54">

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolio.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolio.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolio.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolio.jsp Tue Jan 12 17:05:11 2010
@@ -22,7 +22,7 @@
 <LINK rel="stylesheet" href="style.css" type="text/css" />
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection" scope="request" />
 <jsp:useBean id="quoteDataBeans" type="java.util.Collection" scope="request"/>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolioImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolioImg.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolioImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/portfolioImg.jsp Tue Jan 12 17:05:11 2010
@@ -23,7 +23,7 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="holdingDataBeans" type="java.util.Collection"

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quote.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quote.jsp Tue Jan 12 17:05:11 2010
@@ -23,7 +23,7 @@
 </HEAD>
 
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <TABLE height="54">
   <TBODY>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quoteImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quoteImg.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quoteImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/quoteImg.jsp Tue Jan 12 17:05:11 2010
@@ -24,7 +24,7 @@
 
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.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.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
 <TABLE height="54">

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/runStats.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/runStats.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/runStats.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/runStats.jsp Tue Jan 12 17:05:11 2010
@@ -25,7 +25,7 @@
 	session="false" isThreadSafe="true" isErrorPage="false"%>
 
 <jsp:useBean
-	class="org.apache.geronimo.samples.daytrader.core.spi.RunStatsDataBean"
+	class="org.apache.geronimo.samples.daytrader.beans.RunStatsDataBean"
 	id="runStatsData" scope="request" />
 <% 
 double loginPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.LOGOUT_OP]) / 100.0;

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehome.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehome.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehome.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehome.jsp Tue Jan 12 17:05:11 2010
@@ -23,7 +23,7 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="accountData"

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehomeImg.jsp?rev=898421&r1=898420&r2=898421&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehomeImg.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/tradehomeImg.jsp Tue Jan 12 17:05:11 2010
@@ -23,7 +23,7 @@
 </HEAD>
 <BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
 <%@ page
-	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.spi.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
+	import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 <jsp:useBean id="results" scope="request" type="java.lang.String" />
 <jsp:useBean id="accountData"