incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r900402 - in /incubator/aries/trunk/daytrader-sample: ./ assemblies/ assemblies/assembly-equinox/ assemblies/assembly-equinox/src/ assemblies/assembly-equinox/src/main/ assemblies/assembly-equinox/src/main/resources/ assemblies/assembly-equ...
Date Mon, 18 Jan 2010 14:20:39 GMT
Author: jbohn
Date: Mon Jan 18 14:20:37 2010
New Revision: 900402

URL: http://svn.apache.org/viewvc?rev=900402&view=rev
Log:
ARIES-117 initial check-in of Daytrader for Aries using JDBC persistence only based on Geronimo Daytrader - works in the current form but now must begin to rename all packages and modules and some general cleanup

Added:
    incubator/aries/trunk/daytrader-sample/
    incubator/aries/trunk/daytrader-sample/LICENSE
    incubator/aries/trunk/daytrader-sample/NOTICE
    incubator/aries/trunk/daytrader-sample/README
    incubator/aries/trunk/daytrader-sample/assemblies/
    incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/
    incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml   (with props)
    incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/
    incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/
    incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/
    incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/
    incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini
    incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/tradeDB.sql   (with props)
    incubator/aries/trunk/daytrader-sample/assemblies/pom.xml   (with props)
    incubator/aries/trunk/daytrader-sample/modules/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-api/
      - copied from r899806, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-api/pom.xml
      - copied unchanged from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/pom.xml
    incubator/aries/trunk/daytrader-sample/modules/daytrader-api/src/
      - copied from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-api/src/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-beans/
      - copied from r899806, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-beans/pom.xml
      - copied unchanged from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml
    incubator/aries/trunk/daytrader-sample/modules/daytrader-beans/src/
      - copied from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/src/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-core/
      - copied from r899806, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml
      - copied, changed from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml
    incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/
      - copied from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/
      - copied from r899806, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml
      - copied, changed from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml
    incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/
      - copied from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-util/
      - copied from r899807, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml
      - copied, changed from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/pom.xml
    incubator/aries/trunk/daytrader-sample/modules/daytrader-util/src/
      - copied from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-web/
      - copied from r899805, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/
    incubator/aries/trunk/daytrader-sample/modules/daytrader-web/README
      - copied unchanged from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/README
    incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml
      - copied, changed from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml
    incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/
      - copied from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/
    incubator/aries/trunk/daytrader-sample/modules/pom.xml
      - copied, changed from r899805, geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml
    incubator/aries/trunk/daytrader-sample/pom.xml   (with props)
Modified:
    incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java
    incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java
    incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/web.xml

Added: incubator/aries/trunk/daytrader-sample/LICENSE
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/LICENSE?rev=900402&view=auto
==============================================================================
--- incubator/aries/trunk/daytrader-sample/LICENSE (added)
+++ incubator/aries/trunk/daytrader-sample/LICENSE Mon Jan 18 14:20:37 2010
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Added: incubator/aries/trunk/daytrader-sample/NOTICE
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/NOTICE?rev=900402&view=auto
==============================================================================
--- incubator/aries/trunk/daytrader-sample/NOTICE (added)
+++ incubator/aries/trunk/daytrader-sample/NOTICE Mon Jan 18 14:20:37 2010
@@ -0,0 +1,9 @@
+Apache Geronimo 
+Copyright 2003-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at IBM and donated to the 
+ASF under the Apache 2.0 license.  The former work was referred to 
+as Trade 6.

Added: incubator/aries/trunk/daytrader-sample/README
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/README?rev=900402&view=auto
==============================================================================
--- incubator/aries/trunk/daytrader-sample/README (added)
+++ incubator/aries/trunk/daytrader-sample/README Mon Jan 18 14:20:37 2010
@@ -0,0 +1,156 @@
+(C) Copyright 2006,2008 The Apache Software Foundation.
+----------------------------------------------------------------------
+
+The code in this directory contains the code for the benchmark sample called
+Day Trader.  This sample was contributed by IBM to the Apache Geronimo project
+under the ASF license to further functional and performance testing of Geronimo.  
+
+-----------
+|  BUILD  |
+-----------
+To build DayTrader, you need to have Java SE 5 and Maven 2.0.9 or later
+installed, which can be found at http://maven.apache.org.
+Once installed you can build DayTrader by executing the following command
+from the dayTrader root directory (the directory containing this README):
+
+        mvn clean install
+
+This will build the daytrader-jms, daytrader-derby-datasource, daytrader-jetty
+and daytrader-tomcat plugins.
+
+
+-------------
+|  INSTALL  |
+-------------
+
+Plug-ins
+--------
+After building daytrader, you can go to admin console to install the
+daytrader-jetty or daytrader-tomcat plugin, which will automatically install and
+use the daytrader-derby-datasource. Alternatively, you can install them
+via the "deploy/list-plugins" command, for example:
+
+    gsh deploy/list-plugins -u system -w manager -r file:/<your-local-maven-repo> org.apache.geronimo.daytrader/daytrader-tomcat/2.2-SNAPSHOT/car
+
+For app clients, you'll have to install them using deploy install-plugin
+commands for now, before we publish the app client plugins on a public repo,
+for example: 
+
+    gsh deploy/install-plugin -u system -w manager $DAYTRADER_HOME/daytrader-tomcat/target/daytrader-ws-client-2.2-SNAPSHOT.car
+    gsh deploy/install-plugin -u system -w manager $DAYTRADER_HOME/daytrader-tomcat/target/daytrader-streamer-client-2.2-SNAPSHOT.car 
+
+You will need to create the database and populate the initial data into the
+database.  Make sure Geronimo is started and the GERONIMO_HOME environment
+variable is defined.
+
+1. If you want to use the embedded Apache Derby database, you can populate
+tables and data by visiting http://localhost:8080/daytrader/ in your browser.
+
+2. If you want to use a DB2 database as a back-end database provider, please
+copy DB2 jdbc drivers to server's repository and then build and install the 
+daytrader-db2-datasource plugin before installing the daytrader-jetty/tomcat
+plugin.    
+
+3. If you want to use an Oracle database as a back-end database provider,
+please copy the ojdbc14.jar file from your oracle server to
+$GERONIMO_HOME\repository\oracle\ojdbc14\10g and rename the ojdbc14.jar to a
+maven-recognizable format like ojdbc14-10g.jar.  Then build and install the 
+daytrader-oracle-datasource plugin before installing the daytrader-jetty/tomcat
+plugin.
+
+
+Deployer
+--------
+1. Create the sample's database tables according to your database provider:
+   - If you use the embedded Apache Derby database provider, please perform the
+     following steps:
+      a. Ensure you have JAVA_HOME and GERONIMO_HOME environment variables set
+      b. Execute these commands from a command prompt:
+           cd $DAYTRADER_HOME/bin/dbscripts/derby
+           createDerbyDB.[bat|sh]
+  - If you use another back-end database provider, please perform the following
+    steps:
+    To create the database tables:
+      a. Set up a database or reuse an existing database. For this sample, a
+         database named "tradedb" is used.
+      b. Create a user with a user name of "trade" and a password of "trade".
+         Grant appropriate permissions to this user.
+      c. Load the database schema for this user by running the following at a
+         DBM command window:
+         - For IBM DB2 Express-C and Universal Database (UDB):
+              db2 connect to tradedb
+              db2 -tvf bin\dbscripts\db2\Table.ddl
+         - For Oracle:
+              sqlplus trade/trade@tradedb @bin\dbscripts\oracle\Table.ddl
+    To prep the datasource:
+      a. Download your DBM's JDBC driver from an authorized source.
+      b. Copy this driver to the Geronimo repository, and rename it to a
+         maven-recognizable format.  For example,
+         - For IBM DB2 Express-C and Universal Database (UDB):
+              $GERONIMO_HOME/repository/
+         - For Oracle:
+              $GERONIMO_HOME/repository/oracle/ojdbc14/10g/ojdbc14-10g.jar
+      c. Modify the database resource adapter configuration in your XML plan
+         (see below) to your database environment.  For example, UserName,
+         Password, PortNumber, DatabaseName, ServerName.
+
+2. Use the deployer tool to install the application:
+   - Execute these commands from a command prompt:
+         cd $GERONIMO_HOME/bin
+         deploy.[bat|sh] deploy $DAYTRADER_HOME/modules/ear/target/daytrader-ear-2.2-SNAPSHOT.ear $DAYTRADER_HOME/plans/<My plan>
+           where <My plan> is
+               For Apache Derby:  dayTrader-derby-plan.xml
+               For IBM DB2 v9.1:  dayTrader-db2-9.1-XA-plan.xml
+               For Oracle:        dayTrader-oracle-XA-plan.xml
+               For MS SQL Server: dayTrader-sqlserver-plan.xml
+
+3. Use the admin console to install the application:
+   - Under Applications -> Deploy new
+     a. Select the EAR file indicated above as your archive.
+     b. Select the XML file indicated above as your plan.
+     c. Ensure the checkbox is selected to "start app after install".
+
+
+---------
+|  RUN  |
+---------
+1. Access the dayTrader application at:
+         http://<hostname>:<port>/daytrader.
+2. Before you begin using DayTraader, theres are a couple setup steps:
+   - Populate the database with a set of fictional users, stocks, prices, etc.
+     by selecting:
+         'Configuration -> (Re)-populate Trade Database'.
+     Note: This may take a minute or two depending on your database server.
+   - After populating the database, the DayTrader Configuration options will
+     appear.  Just accept the defaults.
+3. Now you can begin trading by going to:
+         'Trading & Portfolios'
+   Or run the sample test scenario to verify it is installed and working:
+         'Configuration -> Test DayTrader Scenario'
+
+There are two optional application clients you can run, the streamer client and
+web services client.  To run these (from $GERONIMO_HOME/bin):
+   TradeStreamerAppClient:
+      client.[bat|sh] org.apache.geronimo.daytrader/daytrader-streamer-client/2.2-SNAPSHOT/car -waitForMain
+   WSAppClient:
+      client.[bat|sh] org.apache.geronimo.daytrader/daytrader-ws-client/2.2-SNAPSHOT/car -waitForMain
+
+
+---------------
+|  UNINSTALL  |
+---------------
+To uninstall DayTrader, issue the following commands:
+1. If you installed DayTrader as a plugin:
+  - If you installed the DayTrader :: Tomcat plugin:
+      deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader-tomcat/2.2-SNAPSHOT/car
+  - If you installed the DayTrader :: Jetty plugin:
+      deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader-tomcat/2.2-SNAPSHOT/car
+  - To remove the DayTrader :: JMS plugin (Tomcat or Jetty):
+      deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader-jms/2.2-SNAPSHOT/car
+  - To remove the DayTrader :: Derby DataSource (Tomcat or Jetty):
+      deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader-derby-datasource/2.2-SNAPSHOT/car
+
+2. If you installed DayTrader as an application (EAR) using the deployer:
+      deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader/2.2-SNAPSHOT/car
+
+

Added: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml?rev=900402&view=auto
==============================================================================
--- incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml (added)
+++ incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml Mon Jan 18 14:20:37 2010
@@ -0,0 +1,194 @@
+<?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>assemblies</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>assembly-equinox</artifactId>
+	<name>Apache Aries daytrader sample assembly</name>
+	<version>1.0.0</version>
+	<packaging>pom</packaging>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.eclipse</groupId>
+			<artifactId>osgi</artifactId>
+			<version>3.5.0.v20090520</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.equinox</groupId>
+			<artifactId>cm</artifactId>
+			<version>3.2.0-v20070116</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.osgi</groupId>
+			<artifactId>services</artifactId>
+			<version>3.1.200-v20070605</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-api</artifactId>
+			<version>1.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-service</artifactId>
+			<version>1.4</version>
+			<exclusions>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.ops4j.pax.web</groupId>
+			<artifactId>pax-web-extender-war</artifactId>
+			<version>0.7.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ops4j.pax.web</groupId>
+			<artifactId>pax-web-jetty-bundle</artifactId>
+			<version>0.7.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.ops4j.pax.web</groupId>
+			<artifactId>pax-web-jsp</artifactId>
+			<version>0.7.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.5.3.0_1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.aries.blueprint</groupId>
+			<artifactId>org.apache.aries.blueprint</artifactId>
+			<version>1.0.0-incubating-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.aries</groupId>
+			<artifactId>org.apache.aries.util</artifactId>
+			<version>1.0.0-incubating-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.aries.jndi</groupId>
+			<artifactId>org.apache.aries.jndi</artifactId>
+			<version>1.0.0-incubating-SNAPSHOT</version>
+		</dependency>
+
+
+
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-util</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-beans</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-persist-jdbc</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-web</artifactId>
+            <version>${version}</version>
+        </dependency>
+	</dependencies>
+
+	<build>
+
+		<resources>
+			<resource>
+				<directory>${pom.basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>**/*</include>
+				</includes>
+			</resource>
+		</resources>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<outputDirectory>${project.build.directory}</outputDirectory>
+				</configuration>
+				<executions>
+					<execution>
+						<id>filter</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<excludeTransitive>true</excludeTransitive>
+							<outputDirectory>${project.build.directory}</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Propchange: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini?rev=900402&view=auto
==============================================================================
--- incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini (added)
+++ incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/configuration/config.ini Mon Jan 18 14:20:37 2010
@@ -0,0 +1,3 @@
+osgi.bundles=cm-3.2.0-v20070116.jar@start,services-3.1.200-v20070605.jar@start,pax-logging-api-1.4.jar@start,pax-logging-service-1.4.jar@start,derby-10.5.3.0_1.jar@start,pax-web-jetty-bundle-0.7.2.jar@start,pax-web-extender-war-0.7.2.jar@start,pax-web-jsp-0.7.2.jar@start,org.apache.aries.jndi-1.0.0-incubating-SNAPSHOT.jar@start,org.apache.aries.util-1.0.0-incubating-SNAPSHOT.jar@start,org.apache.aries.blueprint-1.0.0-incubating-SNAPSHOT.jar@start,daytrader-util-1.0.0.jar@start,daytrader-beans-1.0.0.jar@start,daytrader-api-1.0.0.jar@start,daytrader-core-1.0.0.jar@start,daytrader-persist-jdbc-1.0.0.jar@start,daytrader-web-1.0.0.jar@start
+eclipse.ignoreApp=true
+org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
\ No newline at end of file

Added: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/tradeDB.sql
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/tradeDB.sql?rev=900402&view=auto
==============================================================================
--- incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/tradeDB.sql (added)
+++ incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/tradeDB.sql Mon Jan 18 14:20:37 2010
@@ -0,0 +1,84 @@
+connect 'jdbc:derby:tradeDB;create=true';
+create table holdingejb
+  (purchaseprice decimal(10, 2),
+   holdingid integer not null,
+   quantity double not null,
+   purchasedate timestamp,
+   account_accountid integer,
+   quote_symbol varchar(250),
+   optLock integer);
+
+alter table holdingejb
+  add constraint pk_holdingejb primary key (holdingid);
+
+create table accountprofileejb
+  (address varchar(250),
+   passwd varchar(250),
+   userid varchar(250) not null,
+   email varchar(250),
+   creditcard varchar(250),
+   fullname varchar(250),
+   optLock integer);
+
+alter table accountprofileejb
+  add constraint pk_accountprofile2 primary key (userid);
+
+create table quoteejb
+  (low decimal(10, 2),
+   open1 decimal(10, 2),
+   volume double not null,
+   price decimal(10, 2),
+   high decimal(10, 2),
+   companyname varchar(250),
+   symbol varchar(250) not null,
+   change1 double not null,
+   optLock integer);
+
+alter table quoteejb
+  add constraint pk_quoteejb primary key (symbol);
+
+create table keygenejb
+  (keyval integer not null,
+   keyname varchar(250) not null);
+
+alter table keygenejb
+  add constraint pk_keygenejb primary key (keyname);
+
+create table accountejb
+  (creationdate timestamp,
+   openbalance decimal(10, 2),
+   logoutcount integer not null,
+   balance decimal(10, 2),
+   accountid integer not null,
+   lastlogin timestamp,
+   logincount integer not null,
+   PROFILE_USERID VARCHAR(250),
+   optLock integer);
+
+alter table accountejb
+  add constraint pk_accountejb primary key (accountid);
+
+create table orderejb
+  (orderfee decimal(10, 2),
+   completiondate timestamp,
+   ordertype varchar(250),
+   orderstatus varchar(250),
+   price decimal(10, 2),
+   quantity double not null,
+   opendate timestamp,
+   orderid integer not null,
+   account_accountid integer,
+   quote_symbol varchar(250),
+   holding_holdingid integer,
+   optLock integer);
+
+alter table orderejb
+  add constraint pk_orderejb primary key (orderid);
+
+create index profile_userid on accountejb(profile_userid);
+create index account_accountid on holdingejb(account_accountid);
+create index account_accountidt on orderejb(account_accountid);
+create index holding_holdingid on orderejb(holding_holdingid);
+create index orderstatus on orderejb(orderstatus);
+create index ordertype on orderejb(ordertype);
+exit;

Propchange: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/tradeDB.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/tradeDB.sql
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/daytrader-sample/assemblies/assembly-equinox/src/main/resources/tradeDB.sql
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/aries/trunk/daytrader-sample/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/assemblies/pom.xml?rev=900402&view=auto
==============================================================================
--- incubator/aries/trunk/daytrader-sample/assemblies/pom.xml (added)
+++ incubator/aries/trunk/daytrader-sample/assemblies/pom.xml Mon Jan 18 14:20:37 2010
@@ -0,0 +1,37 @@
+<?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>daytrader-parent</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.daytrader</groupId>
+    <artifactId>assemblies</artifactId>
+    <name>DayTrader :: Modules</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>assembly-equinox</module>
+    </modules>
+
+</project>

Propchange: incubator/aries/trunk/daytrader-sample/assemblies/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/daytrader-sample/assemblies/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/daytrader-sample/assemblies/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml (from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml?p2=incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml&r1=900400&r2=900402&rev=900402&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-core/pom.xml Mon Jan 18 14:20:37 2010
@@ -43,20 +43,11 @@
             <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>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-api</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
             <scope>provided</scope>
         </dependency>
--->
     </dependencies>
 
     <build>
@@ -83,7 +74,8 @@
                             org.apache.geronimo.samples.daytrader.persistence.api;version=1.0,
                             org.apache.geronimo.samples.daytrader.util;version=1.0,
                             javax.naming,
-                            javax.sql
+                            javax.sql,
+                           org.apache.derby.jdbc
                         </Import-Package>
                         <Private-Package>
                             org.apache.geronimo.samples.daytrader.core

Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java?rev=900402&r1=900400&r2=900402&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java Mon Jan 18 14:20:37 2010
@@ -47,7 +47,8 @@
 
     private static String dsName = TradeConfig.DATASOURCE;
 
-    private static DataSource datasource = null;
+//    private static DataSource dataSource = null;
+    private DataSource dataSource;
 
     private static InitialContext context;
 
@@ -64,6 +65,14 @@
     }
 
     /**
+     * set data source
+     */
+    public void setDataSource(DataSource dataSource) {
+            this.dataSource = dataSource;
+    }
+
+
+    /**
      * Return a String containing the DBProductName configured for
      * the current DataSource
      * 
@@ -373,14 +382,14 @@
     }
 
     /*
-     * Lookup the TradeData datasource
+     * Lookup the TradeData DataSource
      */
-    private void getDataSource() throws Exception {
-        if (datasource == null) {
-            context = new InitialContext();
-            datasource = (DataSource) context.lookup(dsName);
-        }
-    }
+//  private void getDataSource() throws Exception {
+//      if (dataSource == null) {
+//          context = new InitialContext();
+//          dataSource = (DataSource) context.lookup(dsName);
+//      }
+//  }
 
     /*
      * Allocate a new connection to the datasource
@@ -388,8 +397,8 @@
     private Connection getConn() throws Exception {
 
         Connection conn = null;
-        getDataSource();
-        conn = datasource.getConnection();
+//        getDataSource();
+        conn = dataSource.getConnection();
         conn.setAutoCommit(false);
         if (Log.doTrace()) {
             synchronized (lock) {

Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=900402&r1=900400&r2=900402&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Jan 18 14:20:37 2010
@@ -9,7 +9,12 @@
 
   <service id="TradeServicesManager" ref="tradeServicesManagerBean" interface="org.apache.geronimo.samples.daytrader.api.TradeServicesManager"/>
   
+  <bean id="datasource" class="org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource">
+     <property name="databaseName" value="tradeDB"/>
+  </bean>
+
   <bean id="tradeDBManagerBean" class="org.apache.geronimo.samples.daytrader.core.TradeDBManagerImpl" init-method="init">
+      <property name="dataSource" ref="datasource" />
   </bean>
 
   <service id="TradeDBManager" ref="tradeDBManagerBean" interface="org.apache.geronimo.samples.daytrader.api.TradeDBManager">

Copied: incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml (from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml?p2=incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml&r1=900400&r2=900402&rev=900402&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/pom.xml Mon Jan 18 14:20:37 2010
@@ -56,6 +56,11 @@
             <scope>provided</scope>
         </dependency>
 -->
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -82,7 +87,8 @@
                             org.apache.geronimo.samples.daytrader.persistence.api;version=1.0,
                             org.apache.geronimo.samples.daytrader.util;version=1.0,
                             javax.naming,
-                            javax.sql
+                            javax.sql,
+                            org.apache.derby.jdbc
                         </Import-Package>
                         <Private-Package>
                             org.apache.geronimo.samples.daytrader.persist.jdbc

Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java?rev=900402&r1=900400&r2=900402&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJDBCDirect.java Mon Jan 18 14:20:37 2010
@@ -70,7 +70,8 @@
 
     private static String dsName = TradeConfig.DATASOURCE;
 
-    private static DataSource datasource = null;
+//    private static DataSource dataSource = null;
+    private DataSource dataSource;
 
     private static BigDecimal ZERO = new BigDecimal(0.0);
 
@@ -97,6 +98,13 @@
     }
 
     /**
+     * set data source
+     */
+    public void setDataSource(DataSource dataSource) {
+            this.dataSource = dataSource;
+    }
+
+    /**
      * setInSession
      */
     public void setInSession(boolean inSession) {
@@ -1470,14 +1478,14 @@
     }
 
     /*
-     * Lookup the TradeData datasource
+     * Lookup the TradeData DataSource
      */
-    private void getDataSource() throws Exception {
-        if (datasource == null) {
-            context = new InitialContext();
-            datasource = (DataSource) context.lookup(dsName);
-        }
-    }
+//  private void getDataSource() throws Exception {
+//      if (dataSource == null) {
+//          context = new InitialContext();
+//          dataSource = (DataSource) context.lookup(dsName);
+//      }
+//  }
 
     /*
      * Allocate a new connection to the datasource
@@ -1485,8 +1493,8 @@
     private Connection getConn() throws Exception {
 
         Connection conn = null;
-        getDataSource();
-        conn = datasource.getConnection();
+//        getDataSource();
+        conn = dataSource.getConnection();
         conn.setAutoCommit(false);
         if (Log.doTrace()) {
             synchronized (lock) {

Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=900402&r1=900400&r2=900402&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Jan 18 14:20:37 2010
@@ -3,8 +3,13 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
+   <bean id="datasource" class="org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource">
+      <property name="databaseName" value="tradeDB"/>
+   </bean>
+
   <bean id="tradeServicesBeanJDBC" class="org.apache.geronimo.samples.daytrader.persist.jdbc.TradeJDBCDirect" init-method="init">
       <!--<property name="inSession" value="true"/>-->
+      <property name="dataSource" ref="datasource" />
   </bean>
 
   <service id="tradeServicesJDBC" ref="tradeServicesBeanJDBC" interface="org.apache.geronimo.samples.daytrader.api.TradeServices">

Copied: incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml (from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml?p2=incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/pom.xml&r1=900400&r2=900402&rev=900402&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-util/pom.xml Mon Jan 18 14:20:37 2010
@@ -36,11 +36,13 @@
             <artifactId>commons-logging</artifactId>
             <scope>provided</scope>
         </dependency>
+<!--
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+-->
     </dependencies>
 
     <build>

Copied: incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml (from r900400, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml?p2=incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml&r1=900400&r2=900402&rev=900402&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-web/pom.xml Mon Jan 18 14:20:37 2010
@@ -53,7 +53,7 @@
 <!--
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-entities</artifactId>
+            <artifactId>daytrader-beans</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
@@ -67,7 +67,6 @@
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
--->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
@@ -83,6 +82,7 @@
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+-->
         <!-- web container provided specs -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/web.xml?rev=900402&r1=900400&r2=900402&view=diff
==============================================================================
--- incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/web.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/daytrader-web/src/main/resources/WEB-INF/web.xml Mon Jan 18 14:20:37 2010
@@ -45,7 +45,7 @@
         <servlet-class>org.apache.geronimo.samples.daytrader.web.TestServlet</servlet-class>
     </servlet>
 -->
-    
+<!-- Not sure why this is a necessary and it's causing a problem for pax-web so temporarily removed    
     <servlet>
         <display-name>register</display-name>
         <servlet-name>register</servlet-name>
@@ -66,7 +66,7 @@
         <servlet-name>tradehome</servlet-name>
         <jsp-file>/tradehome.jsp</jsp-file>
     </servlet>
-    
+-->    
     <servlet>
         <display-name>TradeConfigServlet</display-name>
         <servlet-name>TradeConfigServlet</servlet-name>

Copied: incubator/aries/trunk/daytrader-sample/modules/pom.xml (from r899805, geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/modules/pom.xml?p2=incubator/aries/trunk/daytrader-sample/modules/pom.xml&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml&r1=899805&r2=900402&rev=900402&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml (original)
+++ incubator/aries/trunk/daytrader-sample/modules/pom.xml Mon Jan 18 14:20:37 2010
@@ -33,11 +33,9 @@
     <modules>
         <module>daytrader-util</module>
         <module>daytrader-beans</module>
-        <module>daytrader-entities</module>
         <module>daytrader-api</module>
         <module>daytrader-core</module>
         <module>daytrader-persist-jdbc</module>
-        <module>daytrader-persist-jpa</module>
         <module>daytrader-web</module>
     </modules>
 

Added: incubator/aries/trunk/daytrader-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/daytrader-sample/pom.xml?rev=900402&view=auto
==============================================================================
--- incubator/aries/trunk/daytrader-sample/pom.xml (added)
+++ incubator/aries/trunk/daytrader-sample/pom.xml Mon Jan 18 14:20:37 2010
@@ -0,0 +1,123 @@
+<?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>
+
+    <groupId>org.apache.geronimo.daytrader</groupId>
+    <version>1.0.0</version>
+    <artifactId>daytrader-parent</artifactId>
+    <name>DayTrader :: Performance Benchmark Sample</name>
+    <packaging>pom</packaging>
+    <description>Java EE 5.0 Performance Benchmark Sample Application</description>
+
+    <properties>
+        <!-- This property is required by the car:package mojo -->
+        <!--<geronimoVersion>2.2</geronimoVersion>-->
+
+        <!-- set siteId to artifactId for any "top level" project rooting a website -->
+        <siteId>daytrader</siteId>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.0.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jsp_2.1_spec</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.5.3.0_1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.0.1</version>
+                    <extensions>true</extensions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <!-- Allow any Java >= 1.5 -->
+                                <requireJavaVersion>
+                                    <version>[1.5,)</version>
+                                </requireJavaVersion>
+
+                                <!-- Allow any Maven >= 2.0.9 -->
+                                <requireMavenVersion>
+                                    <version>[2.0.9,)</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <modules>
+        <!-- Daytrader application components-->
+        <module>modules</module>
+        <!-- Installable assemblies -->
+        <module>assemblies</module>
+    </modules>
+
+</project>

Propchange: incubator/aries/trunk/daytrader-sample/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/daytrader-sample/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/daytrader-sample/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message