incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r910638 - in /incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities: pom.xml src/main/resources/META-INF/persistence.xml
Date Tue, 16 Feb 2010 18:22:37 GMT
Author: jbohn
Date: Tue Feb 16 18:22:34 2010
New Revision: 910638

URL: http://svn.apache.org/viewvc?rev=910638&view=rev
Log:
ARIES-143 eliminate duplicate persistence.xml and use the one in entities

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

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=910638&r1=910637&r2=910638&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml Tue Feb
16 18:22:34 2010
@@ -131,6 +131,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.aries.samples.ariestrader.beans;version="${pom.version}"
                         </Export-Package>

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=910638&r1=910637&r2=910638&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
Tue Feb 16 18:22:34 2010
@@ -17,10 +17,12 @@
 -->
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
 
-    <persistence-unit transaction-type="RESOURCE_LOCAL" name="ariestrader">
+    <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>-->
+        <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.aries.samples.ariestrader.beans.AccountDataBeanImpl</class>
         <class>org.apache.aries.samples.ariestrader.beans.AccountProfileDataBeanImpl</class>



Mime
View raw message