You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2010/03/11 22:40:42 UTC
svn commit: r922024 - in /incubator/aries/trunk/samples/blog: ./ blog-api/
blog-assembly/ blog-assembly/src/main/filtered-resources/configuration/
blog-biz/ blog-datasource/
blog-datasource/src/main/java/org/apache/aries/samples/blog/datasource/
blog-d...
Author: zoe
Date: Thu Mar 11 21:40:41 2010
New Revision: 922024
URL: http://svn.apache.org/viewvc?rev=922024&view=rev
Log:
ARIES-225 Switching the JPA larer to using transaction wrappers
Removed:
incubator/aries/trunk/samples/blog/blog-datasource/src/main/java/org/apache/aries/samples/blog/datasource/ConnectionWrapper.java
incubator/aries/trunk/samples/blog/blog-datasource/src/main/java/org/apache/aries/samples/blog/datasource/XADatasourceEnlistingWrapper.java
Modified:
incubator/aries/trunk/samples/blog/ (props changed)
incubator/aries/trunk/samples/blog/blog-api/ (props changed)
incubator/aries/trunk/samples/blog/blog-assembly/pom.xml
incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
incubator/aries/trunk/samples/blog/blog-biz/ (props changed)
incubator/aries/trunk/samples/blog/blog-datasource/ (props changed)
incubator/aries/trunk/samples/blog/blog-datasource/src/main/resources/OSGI-INF/blueprint/dataSource.xml
incubator/aries/trunk/samples/blog/blog-jdbc-eba/ (props changed)
Propchange: incubator/aries/trunk/samples/blog/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 11 21:40:41 2010
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: incubator/aries/trunk/samples/blog/blog-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 11 21:40:41 2010
@@ -1 +1,2 @@
target
+.settings
Modified: incubator/aries/trunk/samples/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-assembly/pom.xml?rev=922024&r1=922023&r2=922024&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/blog/blog-assembly/pom.xml Thu Mar 11 21:40:41 2010
@@ -210,6 +210,11 @@
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.wrappers</artifactId>
+ </dependency>
+
<!-- Base (JDBC) blog sample code -->
Modified: incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=922024&r1=922023&r2=922024&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini Thu Mar 11 21:40:41 2010
@@ -31,6 +31,8 @@ org.apache.aries.jpa.container-${ariesJp
org.apache.aries.jpa.container.context-${ariesJpaVersion}.jar@start,\
org.apache.aries.transaction.blueprint-${ariesTransactionVersion}.jar@start,\
org.apache.aries.transaction.manager-${ariesTransactionVersion}.jar@start,\
-org.apache.servicemix.bundles.serp-1.13.1_2.jar@start
+org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\
+org.apache.aries.samples.blog.datasource-0.1-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.transaction.wrappers-${ariesTransactionVersion}.jar@start
eclipse.ignoreApp=true
org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
Propchange: incubator/aries/trunk/samples/blog/blog-biz/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 11 21:40:41 2010
@@ -1 +1,2 @@
target
+.settings
Propchange: incubator/aries/trunk/samples/blog/blog-datasource/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 11 21:40:41 2010
@@ -0,0 +1,3 @@
+.externalToolBuilders
+.settings
+target
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=922024&r1=922023&r2=922024&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 Thu Mar 11 21:40:41 2010
@@ -22,20 +22,12 @@
xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0"
default-activation="lazy">
- <bean id="dataSourceWrapper" class="org.apache.aries.samples.blog.datasource.XADatasourceEnlistingWrapper">
- <property name="txManager" ref="txManager"/>
- <property name="dataSource" ref="derbyXADataSource"/>
- </bean>
-
<bean id="derbyXADataSource" class="org.apache.derby.jdbc.EmbeddedXADataSource">
<property name="databaseName" value="blogDB"/>
</bean>
+
+ <service id="xaDataSource" ref="derbyXADataSource" interface="javax.sql.XADataSource"/>
- <service id="enlistingDataSource" ref="dataSourceWrapper" interface="javax.sql.DataSource">
- <service-properties>
- <entry key="xa.aware" value="true"/>
- </service-properties>
- </service>
<bean id="derbyDataSource" class="org.apache.derby.jdbc.EmbeddedDataSource">
<property name="databaseName" value="blogDB"/>
@@ -47,5 +39,4 @@
</service-properties>
</service>
- <reference id="txManager" interface="javax.transaction.TransactionManager"/>
</blueprint>
\ No newline at end of file
Propchange: incubator/aries/trunk/samples/blog/blog-jdbc-eba/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 11 21:40:41 2010
@@ -0,0 +1 @@
+.settings