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/02/02 22:04:47 UTC
svn commit: r905795 [2/2] - in /geronimo/sandbox/jbohn/daytrader-bp-new:
assemblies/web/ assemblies/web/daytrader-eba-all/
assemblies/web/daytrader-eba-all/src/
assemblies/web/daytrader-eba-all/src/main/
assemblies/web/daytrader-eba-all/src/main/assemb...
Added: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/LICENSE?rev=905795&view=auto
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/LICENSE (added)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/LICENSE Tue Feb 2 21:04: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: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/NOTICE?rev=905795&view=auto
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/NOTICE (added)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/NOTICE Tue Feb 2 21:04:37 2010
@@ -0,0 +1,9 @@
+Apache Geronimo
+Copyright 2003-2010 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: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml?rev=905795&view=auto
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml (added)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml Tue Feb 2 21:04:37 2010
@@ -0,0 +1,52 @@
+<?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.
+-->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+
+ <persistence-unit transaction-type="RESOURCE_LOCAL" name="daytrader-am">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <jta-data-source>javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/TradeDataSource)</jta-data-source>
+ <non-jta-data-source>javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/NoTxTradeDataSource)</non-jta-data-source>
+
+ <class>org.apache.geronimo.samples.daytrader.beans.AccountDataBeanImpl</class>
+ <class>org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBeanImpl</class>
+ <class>org.apache.geronimo.samples.daytrader.beans.HoldingDataBeanImpl</class>
+ <class>org.apache.geronimo.samples.daytrader.beans.OrderDataBeanImpl</class>
+ <class>org.apache.geronimo.samples.daytrader.beans.QuoteDataBeanImpl</class>
+ <exclude-unlisted-classes>true</exclude-unlisted-classes>
+
+ <properties>
+ <property name="openjpa.BrokerImpl" value="non-finalizing" />
+ <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+ <property name="openjpa.jdbc.UpdateManager" value="org.apache.openjpa.jdbc.kernel.BatchingConstraintUpdateManager"/>
+ </properties>
+
+
+ <!--
+ <properties>
+ <property name="openjpa.jdbc.DBDictionary" value="derby" />
+ <property name="openjpa.ConnectionProperties" value="DriverClassName=com.ibm.db2.jcc.DB2Driver,URL=jdbc:db2://9.12.24.171:50000/TRADE61,MaxActive=50,MaxWait=10000,Username=db2inst1,Password=db2inst1"/>
+ <property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource"/>
+ <property name="openjpa.jdbc.DBDictionary" value="db2(batchLimit=600)"/>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
+ <property name="openjpa.Multithreaded" value="true"/>
+ <property name="openjpa.Compatibility" value="flushBeforeDetach=false"/>
+ <property name="openjpa.jdbc.UpdateManager" value="com.ibm.ws.persistence.jdbc.kernel.OperationOrderUpdateManager(batchLimit=0)" />
+ </properties>
+ -->
+ </persistence-unit>
+</persistence>
Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=905795&view=auto
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml (added)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Feb 2 21:04:37 2010
@@ -0,0 +1,16 @@
+<blueprint default-activation="lazy"
+ xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <bean id="tradeServicesBeanJPA-AM" class="org.apache.geronimo.samples.daytrader.persist.jpa.TradeJpaAm" init-method="init">
+ </bean>
+
+ <service id="tradeServicesJPA-AM" ref="tradeServicesBeanJPA-AM" interface="org.apache.geronimo.samples.daytrader.api.TradeServices">
+ <service-properties>
+ <entry key="mode" value="jpa-am"/>
+ </service-properties>
+ </service>
+
+</blueprint>
+
Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=905795&r1=905794&r2=905795&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 Feb 2 21:04:37 2010
@@ -71,6 +71,7 @@
<instructions>
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
+ <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
<Export-Package>
<!--org.apache.geronimo.samples.daytrader.persist.jpa;version=1.0.0-->
</Export-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=905795&r1=905794&r2=905795&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 Feb 2 21:04:37 2010
@@ -65,7 +65,7 @@
private static boolean initialized = false;
- @PersistenceContext(unitName="daytrader")
+ @PersistenceContext(unitName="daytrader-cm")
public void setEntityManager (EntityManager em) {
entityManager = em;
}
@@ -153,7 +153,7 @@
return marketSummaryData;
}
- public OrderDataBean buy(String userID, String symbol, double quantity, int orderProcessingMode) {
+ public OrderDataBean buy(String userID, String symbol, double quantity, int orderProcessingMode) throws Exception {
OrderDataBean order = null;
BigDecimal total;
@@ -201,8 +201,7 @@
return order;
}
- public OrderDataBean sell(String userID, Integer holdingID,
- int orderProcessingMode) {
+ public OrderDataBean sell(String userID, Integer holdingID, int orderProcessingMode) throws Exception {
OrderDataBean order = null;
BigDecimal total;
@@ -274,8 +273,7 @@
"TradeJPADirect:queueOrder() not implemented for this runtime mode");
}
- public OrderDataBean completeOrder(Integer orderID, boolean twoPhase)
- throws Exception {
+ public OrderDataBean completeOrder(Integer orderID, boolean twoPhase) throws Exception {
OrderDataBeanImpl order = null;
@@ -319,6 +317,7 @@
}
try {
+
if (newHolding != null) {
order.setHolding(newHolding);
}
@@ -357,7 +356,7 @@
return order;
}
- public void cancelOrder(Integer orderID, boolean twoPhase) {
+ public void cancelOrder(Integer orderID, boolean twoPhase) throws Exception {
if (Log.doTrace())
Log.trace("TradeJPADirect:cancelOrder", orderID + " twoPhase=" + twoPhase);
@@ -381,7 +380,7 @@
return account.getOrders();
}
- public Collection<OrderDataBean> getClosedOrders(String userID) {
+ public Collection<OrderDataBean> getClosedOrders(String userID) throws Exception {
if (Log.doTrace())
Log.trace("TradeJPADirect:getClosedOrders", userID);
@@ -404,7 +403,6 @@
if (TradeConfig.jpaLayer == TradeConfig.OPENJPA) {
Query updateStatus = entityManager.createNamedQuery("orderejb.completeClosedOrders");
updateStatus.setParameter("userID", userID);
-
updateStatus.executeUpdate();
}
else if (TradeConfig.jpaLayer == TradeConfig.HIBERNATE) {
@@ -445,7 +443,7 @@
}
- public QuoteDataBean createQuote(String symbol, String companyName, BigDecimal price) {
+ public QuoteDataBean createQuote(String symbol, String companyName, BigDecimal price) throws Exception {
try {
QuoteDataBeanImpl quote = new QuoteDataBeanImpl(symbol, companyName, 0, price, price, price, price, 0);
@@ -480,8 +478,7 @@
return query.getResultList();
}
- public QuoteDataBean updateQuotePriceVolume(String symbol,
- BigDecimal changeFactor, double sharesTraded) {
+ public QuoteDataBean updateQuotePriceVolume(String symbol, BigDecimal changeFactor, double sharesTraded) throws Exception {
if (!TradeConfig.getUpdateQuotePrices()) {
return new QuoteDataBeanImpl();
}
@@ -524,14 +521,16 @@
return quote;
}
- public Collection<HoldingDataBean> getHoldings(String userID) {
+ public Collection<HoldingDataBean> getHoldings(String userID) throws Exception {
if (Log.doTrace())
Log.trace("TradeJPADirect:getHoldings", userID);
+ Collection<HoldingDataBean> holdings = null;
+
Query query = entityManager.createNamedQuery("holdingejb.holdingsByUserID");
query.setParameter("userID", userID);
- Collection<HoldingDataBean> holdings = query.getResultList();
+ holdings = query.getResultList();
/*
* Inflate the lazy data memebers
*/
@@ -574,7 +573,12 @@
return apb;
}
- public AccountProfileDataBean updateAccountProfile(String userID, String password, String fullName, String address, String email, String creditcard) throws Exception {
+ public AccountProfileDataBean updateAccountProfile( String userID,
+ String password,
+ String fullName,
+ String address,
+ String email,
+ String creditcard) throws Exception {
if (Log.doTrace())
@@ -620,12 +624,13 @@
Log.trace("TradeJPADirect:login", userID, password);
account.login(password);
+
if (Log.doTrace())
Log.trace("TradeJPADirect:login(" + userID + "," + password + ") success" + account);
return account;
}
- public void logout(String userID) {
+ public void logout(String userID) throws Exception {
if (Log.doTrace())
Log.trace("TradeJPADirect:logout", userID);
@@ -638,9 +643,13 @@
Log.trace("TradeJPADirect:logout(" + userID + ") success");
}
- public AccountDataBean register(String userID, String password, String fullname,
- String address, String email, String creditcard,
- BigDecimal openBalance) {
+ public AccountDataBean register(String userID,
+ String password,
+ String fullname,
+ String address,
+ String email,
+ String creditcard,
+ BigDecimal openBalance) throws Exception {
AccountDataBeanImpl account = null;
AccountProfileDataBeanImpl profile = null;
@@ -665,7 +674,6 @@
entityManager.persist(account);
}
-
return account;
}
@@ -711,7 +719,9 @@
}
private HoldingDataBean createHolding(AccountDataBean account,
- QuoteDataBean quote, double quantity, BigDecimal purchasePrice) throws Exception {
+ QuoteDataBean quote,
+ double quantity,
+ BigDecimal purchasePrice) throws Exception {
HoldingDataBeanImpl newHolding = new HoldingDataBeanImpl(quantity,
purchasePrice, new Timestamp(System.currentTimeMillis()),
account, quote);
@@ -730,8 +740,7 @@
}
public QuoteDataBean pingTwoPhase(String symbol) throws Exception {
- Log
- .error("TradeJPADirect:pingTwoPhase - is not implemented for this runtime mode");
+ Log.error("TradeJPADirect:pingTwoPhase - is not implemented for this runtime mode");
throw new UnsupportedOperationException("TradeJPADirect:pingTwoPhase - is not implemented for this runtime mode");
}
@@ -749,7 +758,7 @@
* @return int mode
*/
public int getMode() {
- return TradeConfig.JPA;
+ return TradeConfig.JPA_CM;
}
}
Copied: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/resources/META-INF/persistence.xml (from r899740, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/resources/META-INF/persistence.xml?p2=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/resources/META-INF/persistence.xml&p1=geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml&r1=899740&r2=905795&rev=905795&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/src/main/resources/META-INF/persistence.xml Tue Feb 2 21:04:37 2010
@@ -17,7 +17,7 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit transaction-type="JTA" name="daytrader">
+ <persistence-unit transaction-type="JTA" name="daytrader-cm">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<jta-data-source>javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/TradeDataSource)</jta-data-source>
<non-jta-data-source>javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/NoTxTradeDataSource)</non-jta-data-source>
@@ -32,7 +32,7 @@
<properties>
<property name="openjpa.BrokerImpl" value="non-finalizing" />
<property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
- <property name="openjpa.jdbc.UpdateManager" value="com.ibm.ws.persistence.jdbc.kernel.OperationOrderUpdateManager(batchLimit=0)" />
+ <property name="openjpa.jdbc.UpdateManager" value="org.apache.openjpa.jdbc.kernel.BatchingConstraintUpdateManager"/>
</properties>
@@ -45,7 +45,7 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
<property name="openjpa.Multithreaded" value="true"/>
<property name="openjpa.Compatibility" value="flushBeforeDetach=false"/>
- <property name="openjpa.jdbc.UpdateManager" value="org.apache.openjpa.jdbc.kernel.BatchingConstraintUpdateManager"/>
+ <property name="openjpa.jdbc.UpdateManager" value="com.ibm.ws.persistence.jdbc.kernel.OperationOrderUpdateManager(batchLimit=0)" />
</properties>
-->
</persistence-unit>
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java?rev=905795&r1=905794&r2=905795&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java Tue Feb 2 21:04:37 2010
@@ -32,12 +32,18 @@
/* Trade Runtime Configuration Parameters */
/* Trade Runtime Mode parameters */
- public static String[] runTimeModeNames = {"Full EJB3", "Direct (JDBC)", "Session (EJB3) To Direct", "Web JDBC", "Web JPA"};
+ public static String[] runTimeModeNames = { "Full EJB3",
+ "Direct (JDBC)",
+ "Session (EJB3) To Direct",
+ "JDBC",
+ "JPA App Managed",
+ "JPA Container Managed"};
public static final int EJB3 = 0;
public static final int DIRECT = 1;
public static final int SESSION3 = 2;
public static final int JDBC = 3;
- public static final int JPA = 4;
+ public static final int JPA_AM = 4;
+ public static final int JPA_CM = 5;
public static int runTimeMode = JDBC;
/* Trade JPA Layer parameters */
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml?rev=905795&r1=905794&r2=905795&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml Tue Feb 2 21:04:37 2010
@@ -38,6 +38,7 @@
<module>daytrader-core</module>
<module>daytrader-persist-jdbc</module>
<module>daytrader-persist-jpa</module>
+ <module>daytrader-persist-jpa-am</module>
<module>daytrader-web</module>
</modules>