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/03 22:12:24 UTC
svn commit: r906245 - in /incubator/aries/trunk/ariestrader-sample/modules:
ariestrader-entities/ ariestrader-entities/src/main/resources/META-INF/
ariestrader-persist-jpa-am/
ariestrader-persist-jpa-am/src/main/resources/META-INF/
ariestrader-persist-...
Author: jbohn
Date: Wed Feb 3 21:12:24 2010
New Revision: 906245
URL: http://svn.apache.org/viewvc?rev=906245&view=rev
Log:
ARIES-143 include modules from DayTrader sandbox necessary for AriesTrader JPA Application Managed persistence
Added:
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/
- copied from r906236, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/
- copied from r906236, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/
Modified:
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/pom.xml
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml?rev=906245&r1=906236&r2=906245&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml Wed Feb 3 21:12:24 2010
@@ -19,27 +19,27 @@
<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>
</parent>
- <groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-entities</artifactId>
+ <groupId>org.apache.aries.ariestrader.modules</groupId>
+ <artifactId>ariestrader-entities</artifactId>
<packaging>bundle</packaging>
- <name>DayTrader :: Modules - Entities</name>
- <description>Daytrader JPA Enhanced Enttities Module</description>
+ <name>AriesTrader :: Modules - Entities</name>
+ <description>AriesTrader JPA Enhanced Enttities Module</description>
<dependencies>
<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-util</artifactId>
+ <groupId>org.apache.aries.ariestrader.modules</groupId>
+ <artifactId>ariestrader-util</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
@@ -128,12 +128,12 @@
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
<Export-Package>
- org.apache.geronimo.samples.daytrader.beans;version="${pom.version}"
+ org.apache.aries.samples.ariestrader.beans;version="${pom.version}"
</Export-Package>
<Import-Package>
- org.apache.geronimo.samples.daytrader.beans,
- org.apache.geronimo.samples.daytrader.util,
- org.apache.geronimo.samples.daytrader.persistence.api,
+ org.apache.aries.samples.ariestrader.beans,
+ org.apache.aries.samples.ariestrader.util,
+ org.apache.aries.samples.ariestrader.persistence.api,
org.apache.openjpa.enhance,
org.apache.openjpa.util,
javax.persistence
Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml?rev=906245&r1=906236&r2=906245&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml Wed Feb 3 21:12:24 2010
@@ -17,16 +17,16 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit transaction-type="RESOURCE_LOCAL" name="daytrader">
+ <persistence-unit transaction-type="RESOURCE_LOCAL" name="ariestrader">
<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>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>
+ <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-am/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/pom.xml?rev=906245&r1=906236&r2=906245&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/pom.xml Wed Feb 3 21:12:24 2010
@@ -19,33 +19,33 @@
<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>
</parent>
- <groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-persist-jpa-am</artifactId>
+ <groupId>org.apache.aries.ariestrader.modules</groupId>
+ <artifactId>ariestrader-persist-jpa-am</artifactId>
<packaging>bundle</packaging>
- <name>DayTrader :: Modules - Persist JPA App Managed</name>
- <description>Daytrader Persist JPA App Managed Module</description>
+ <name>AriesTrader :: Modules - Persist JPA App Managed</name>
+ <description>AriesTrader Persist JPA App 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>
@@ -73,17 +73,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,
+ 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
</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-am/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml?rev=906245&r1=906236&r2=906245&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml Wed Feb 3 21:12:24 2010
@@ -17,16 +17,16 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit transaction-type="RESOURCE_LOCAL" name="daytrader-am">
+ <persistence-unit transaction-type="RESOURCE_LOCAL" name="ariestrader-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>
+ <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>
+ <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-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=906245&r1=906236&r2=906245&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml Wed Feb 3 21:12:24 2010
@@ -3,10 +3,10 @@
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 id="tradeServicesBeanJPA-AM" class="org.apache.aries.samples.ariestrader.persist.jpa.TradeJpaAm" init-method="init">
</bean>
- <service id="tradeServicesJPA-AM" ref="tradeServicesBeanJPA-AM" interface="org.apache.geronimo.samples.daytrader.api.TradeServices">
+ <service id="tradeServicesJPA-AM" ref="tradeServicesBeanJPA-AM" interface="org.apache.aries.samples.ariestrader.api.TradeServices">
<service-properties>
<entry key="mode" value="jpa-am"/>
</service-properties>