incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r927690 - in /incubator/aries/trunk/samples/blog: blog-datasource/src/main/resources/OSGI-INF/blueprint/dataSource.xml blog-persistence-jpa/src/main/resources/META-INF/persistence.xml
Date Fri, 26 Mar 2010 04:56:16 GMT
Author: gawor
Date: Fri Mar 26 04:56:15 2010
New Revision: 927690

URL: http://svn.apache.org/viewvc?rev=927690&view=rev
Log:
use standard osgi.jndi.service.name property

Modified:
    incubator/aries/trunk/samples/blog/blog-datasource/src/main/resources/OSGI-INF/blueprint/dataSource.xml
    incubator/aries/trunk/samples/blog/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml

Modified: incubator/aries/trunk/samples/blog/blog-datasource/src/main/resources/OSGI-INF/blueprint/dataSource.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-datasource/src/main/resources/OSGI-INF/blueprint/dataSource.xml?rev=927690&r1=927689&r2=927690&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-datasource/src/main/resources/OSGI-INF/blueprint/dataSource.xml
(original)
+++ incubator/aries/trunk/samples/blog/blog-datasource/src/main/resources/OSGI-INF/blueprint/dataSource.xml
Fri Mar 26 04:56:15 2010
@@ -28,7 +28,7 @@
   
   <service id="xaDataSource" ref="derbyXADataSource" interface="javax.sql.XADataSource">
   <service-properties>
-    <entry key="osgi.jndi.serviceName" value="jdbc/blogdb"/>
+    <entry key="osgi.jndi.service.name" value="jdbc/blogdb"/>
    </service-properties>
   </service>
 
@@ -39,8 +39,8 @@
   
   <service ref="derbyDataSource" interface="javax.sql.DataSource">
    <service-properties>
-     <entry key="osgi.jndi.serviceName" value="jdbc/blogdbnojta"/>
+     <entry key="osgi.jndi.service.name" value="jdbc/blogdbnojta"/>
    </service-properties>
   </service>
   
-</blueprint>
\ No newline at end of file
+</blueprint>

Modified: incubator/aries/trunk/samples/blog/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml?rev=927690&r1=927689&r2=927690&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml
(original)
+++ incubator/aries/trunk/samples/blog/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml
Fri Mar 26 04:56:15 2010
@@ -24,8 +24,8 @@
 
     <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
 
-    <jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/blogdb)</jta-data-source>
-    <non-jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/blogdbnojta)</non-jta-data-source>
+    <jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/blogdb)</jta-data-source>
+    <non-jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/blogdbnojta)</non-jta-data-source>
 
     <class>org.apache.aries.samples.blog.persistence.entity.AuthorImpl</class>
     <class>org.apache.aries.samples.blog.persistence.entity.EntryImpl</class>



Mime
View raw message