You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/02/11 16:58:28 UTC
svn commit: r909040 - in
/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm:
./ src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/
src/main/resources/META-INF/ src/main/resources/OSGI-INF/blueprint/
Author: jbohn
Date: Thu Feb 11 15:58:19 2010
New Revision: 909040
URL: http://svn.apache.org/viewvc?rev=909040&view=rev
Log:
ARIES-144 start of persistence using container managed jpa
Added:
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/
- copied from r909022, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-cm/
Modified:
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJpaCm.java
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml?rev=909040&r1=909022&r2=909040&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml Thu Feb 11 15:58:19 2010
@@ -19,41 +19,48 @@
<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>
+ <groupId>org.apache.aries.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-persist-jpa-cm</artifactId>
+ <groupId>org.apache.aries.ariestrader.modules</groupId>
+ <artifactId>ariestrader-persist-jpa-cm</artifactId>
<packaging>bundle</packaging>
- <name>DayTrader :: Modules - Persist JPA</name>
- <description>Daytrader Persist JPA Module</description>
+ <name>AriesTrader :: Modules - Persist JPA Container Managed</name>
+ <description>AriesTrader Persist JPA Container Managed Module</description>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-util</artifactId>
+ <groupId>org.apache.aries.ariestrader.modules</groupId>
+ <artifactId>ariestrader-util</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-api</artifactId>
+ <groupId>org.apache.aries.ariestrader.modules</groupId>
+ <artifactId>ariestrader-api</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-entities</artifactId>
+ <groupId>org.apache.aries.ariestrader.modules</groupId>
+ <artifactId>ariestrader-entities</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+-->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -73,17 +80,17 @@
<Bundle-Version>${pom.version}</Bundle-Version>
<Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
<Export-Package>
- <!--org.apache.geronimo.samples.daytrader.persist.jpa;version="${pom.version}"-->
+ <!--org.apache.aries.samples.ariestrader.persist.jpa;version="${pom.version}"-->
</Export-Package>
<Import-Package>
- org.apache.geronimo.samples.daytrader.api,
- org.apache.geronimo.samples.daytrader.beans,
- org.apache.geronimo.samples.daytrader.persistence.api,
- org.apache.geronimo.samples.daytrader.util,
- javax.persistence
+ org.apache.aries.samples.ariestrader.api,
+ org.apache.aries.samples.ariestrader.beans,
+ org.apache.aries.samples.ariestrader.persistence.api,
+ org.apache.aries.samples.ariestrader.util,
+ javax.persistence;version="[1.0.0,2.1.0)"
</Import-Package>
<Private-Package>
- org.apache.geronimo.samples.daytrader.persist.jpa
+ org.apache.aries.samples.ariestrader.persist.jpa
</Private-Package>
</instructions>
</configuration>
Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJpaCm.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJpaCm.java?rev=909040&r1=909022&r2=909040&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJpaCm.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/geronimo/samples/daytrader/persist/jpa/TradeJpaCm.java Thu Feb 11 15:58:19 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader.persist.jpa;
+package org.apache.aries.samples.ariestrader.persist.jpa;
import java.math.BigDecimal;
import java.sql.Timestamp;
@@ -26,21 +26,21 @@
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
-import org.apache.geronimo.samples.daytrader.api.TradeServices;
-import org.apache.geronimo.samples.daytrader.beans.AccountDataBeanImpl;
-import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBeanImpl;
-import org.apache.geronimo.samples.daytrader.beans.HoldingDataBeanImpl;
-import org.apache.geronimo.samples.daytrader.beans.OrderDataBeanImpl;
-import org.apache.geronimo.samples.daytrader.beans.QuoteDataBeanImpl;
-import org.apache.geronimo.samples.daytrader.persistence.api.AccountDataBean;
-import org.apache.geronimo.samples.daytrader.persistence.api.AccountProfileDataBean;
-import org.apache.geronimo.samples.daytrader.persistence.api.HoldingDataBean;
-import org.apache.geronimo.samples.daytrader.persistence.api.MarketSummaryDataBean;
-import org.apache.geronimo.samples.daytrader.persistence.api.OrderDataBean;
-import org.apache.geronimo.samples.daytrader.persistence.api.QuoteDataBean;
-import org.apache.geronimo.samples.daytrader.util.FinancialUtils;
-import org.apache.geronimo.samples.daytrader.util.Log;
-import org.apache.geronimo.samples.daytrader.util.TradeConfig;
+import org.apache.aries.samples.ariestrader.api.TradeServices;
+import org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl;
+import org.apache.aries.samples.ariestrader.beans.AccountProfileDataBeanImpl;
+import org.apache.aries.samples.ariestrader.beans.HoldingDataBeanImpl;
+import org.apache.aries.samples.ariestrader.beans.OrderDataBeanImpl;
+import org.apache.aries.samples.ariestrader.beans.QuoteDataBeanImpl;
+import org.apache.aries.samples.ariestrader.persistence.api.AccountDataBean;
+import org.apache.aries.samples.ariestrader.persistence.api.AccountProfileDataBean;
+import org.apache.aries.samples.ariestrader.persistence.api.HoldingDataBean;
+import org.apache.aries.samples.ariestrader.persistence.api.MarketSummaryDataBean;
+import org.apache.aries.samples.ariestrader.persistence.api.OrderDataBean;
+import org.apache.aries.samples.ariestrader.persistence.api.QuoteDataBean;
+import org.apache.aries.samples.ariestrader.util.FinancialUtils;
+import org.apache.aries.samples.ariestrader.util.Log;
+import org.apache.aries.samples.ariestrader.util.TradeConfig;
/**
* TradeJpaCm uses JPA via Container Managed (CM) Entity
@@ -49,10 +49,10 @@
* the features and operations that can be performed by
* customers of the brokerage such as login, logout, get a stock
* quote, buy or sell a stock, etc. and are specified in the
- * {@link org.apache.geronimo.samples.daytrader.TradeServices}
+ * {@link org.apache.aries.samples.ariestrader.TradeServices}
* interface
*
- * @see org.apache.geronimo.samples.daytrader.TradeServices
+ * @see org.apache.aries.samples.ariestrader.TradeServices
*
*/
@@ -64,7 +64,7 @@
private static boolean initialized = false;
- @PersistenceContext(unitName="daytrader-cm")
+// @PersistenceContext(unitName="ariestrader-cm")
public void setEntityManager (EntityManager em) {
entityManager = em;
}
@@ -422,7 +422,7 @@
+ "a.OPENBALANCE, "
+ "a.PROFILE_USERID "
+ "from accountejb a where a.profile_userid = ?",
- org.apache.geronimo.samples.daytrader.beans.AccountDataBeanImpl.class);
+ org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl.class);
findaccountid.setParameter(1, userID);
AccountDataBeanImpl account = (AccountDataBeanImpl) findaccountid.getSingleResult();
Integer accountid = account.getAccountID();
Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml?rev=909040&r1=909022&r2=909040&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml Thu Feb 11 15:58:19 2010
@@ -17,16 +17,16 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit transaction-type="JTA" name="daytrader-cm">
+ <persistence-unit transaction-type="JTA" name="ariestrader-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>
+ <jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/TradeDataSource)</jta-data-source>
+ <non-jta-data-source>aries:services/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>
+ <class>org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl</class>
+ <class>org.apache.aries.samples.ariestrader.beans.AccountProfileDataBeanImpl</class>
+ <class>org.apache.aries.samples.ariestrader.beans.HoldingDataBeanImpl</class>
+ <class>org.apache.aries.samples.ariestrader.beans.OrderDataBeanImpl</class>
+ <class>org.apache.aries.samples.ariestrader.beans.QuoteDataBeanImpl</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
@@ -38,15 +38,15 @@
<!--
<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>
- -->
+ <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>
Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=909040&r1=909022&r2=909040&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml Thu Feb 11 15:58:19 2010
@@ -1,12 +1,14 @@
<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">
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:jpa="http://aries.apache.org/xmlns/jpa/v1.0.0">
- <bean id="tradeServicesBeanJPA-CM" class="org.apache.geronimo.samples.daytrader.persist.jpa.TradeJpaCm" init-method="init">
+ <bean id="tradeServicesBeanJPA-CM" class="org.apache.aries.samples.ariestrader.persist.jpa.TradeJpaCm" init-method="init">
+ <jpa:context property="entityManager" unitname="ariestrader-cm" />
</bean>
- <service id="tradeServicesJPA-CM" ref="tradeServicesBeanJPA-CM" interface="org.apache.geronimo.samples.daytrader.api.TradeServices">
+ <service id="tradeServicesJPA-CM" ref="tradeServicesBeanJPA-CM" interface="org.apache.aries.samples.ariestrader.api.TradeServices">
<service-properties>
<entry key="mode" value="jpa-cm"/>
</service-properties>