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/03/03 16:58:57 UTC
svn commit: r918536 - in /geronimo/sandbox/jbohn:
daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/
daytrader-bp-CntEM/modules/entities/src/main/resources/META-INF/
daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/...
Author: jbohn
Date: Wed Mar 3 15:58:57 2010
New Revision: 918536
URL: http://svn.apache.org/viewvc?rev=918536&view=rev
Log:
use fully qualified osgi service name for datasources
Modified:
geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml
geronimo/sandbox/jbohn/daytrader-bp-CntEM/modules/entities/src/main/resources/META-INF/persistence.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/src/main/resources/META-INF/persistence.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml
Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml?rev=918536&r1=918535&r2=918536&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml Wed Mar 3 15:58:57 2010
@@ -19,8 +19,8 @@
<persistence-unit transaction-type="RESOURCE_LOCAL" name="daytrader">
<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.AccountDataBean</class>
<class>org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean</class>
Modified: geronimo/sandbox/jbohn/daytrader-bp-CntEM/modules/entities/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-CntEM/modules/entities/src/main/resources/META-INF/persistence.xml?rev=918536&r1=918535&r2=918536&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-CntEM/modules/entities/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-CntEM/modules/entities/src/main/resources/META-INF/persistence.xml Wed Mar 3 15:58:57 2010
@@ -19,8 +19,8 @@
<persistence-unit transaction-type="JTA" name="daytrader">
<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.AccountDataBean</class>
<class>org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean</class>
Modified: 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-entities/src/main/resources/META-INF/persistence.xml?rev=918536&r1=918535&r2=918536&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-entities/src/main/resources/META-INF/persistence.xml Wed Mar 3 15:58:57 2010
@@ -19,8 +19,8 @@
<persistence-unit transaction-type="RESOURCE_LOCAL" name="daytrader">
<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>
Modified: 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=918536&r1=918535&r2=918536&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-am/src/main/resources/META-INF/persistence.xml Wed Mar 3 15:58:57 2010
@@ -19,8 +19,8 @@
<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>
+ <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>
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml?rev=918536&r1=918535&r2=918536&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml Wed Mar 3 15:58:57 2010
@@ -19,8 +19,8 @@
<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>
+ <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>