Return-Path: Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org Received: (qmail 29109 invoked from network); 15 Mar 2010 19:44:05 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Mar 2010 19:44:05 -0000 Received: (qmail 11879 invoked by uid 500); 15 Mar 2010 19:43:18 -0000 Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org Received: (qmail 11817 invoked by uid 500); 15 Mar 2010 19:43:18 -0000 Mailing-List: contact aries-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: aries-dev@incubator.apache.org Delivered-To: mailing list aries-commits@incubator.apache.org Received: (qmail 11809 invoked by uid 99); 15 Mar 2010 19:43:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Mar 2010 19:43:18 +0000 X-ASF-Spam-Status: No, hits=-1001.3 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Mar 2010 19:43:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7542D23889D2; Mon, 15 Mar 2010 19:42:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r923407 - in /incubator/aries/trunk/samples/ariestrader-sample: assemblies/equinox-test-harness/ assemblies/equinox-test-harness/src/main/filtered-resources/configuration/ modules/ariestrader-core/src/main/java/org/apache/aries/samples/arie... Date: Mon, 15 Mar 2010 19:42:56 -0000 To: aries-commits@incubator.apache.org From: jbohn@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100315194256.7542D23889D2@eris.apache.org> Author: jbohn Date: Mon Mar 15 19:42:55 2010 New Revision: 923407 URL: http://svn.apache.org/viewvc?rev=923407&view=rev Log: ARIES-241 leverage the transaction.wrappers bundle to enlist datasource in xa transaction for AriesTrader Added: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/blueprint/ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/blueprint/blueprint.xml (with props) Removed: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/java/ Modified: incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/pom.xml incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java Modified: incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/pom.xml URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/pom.xml?rev=923407&r1=923406&r2=923407&view=diff ============================================================================== --- incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/pom.xml (original) +++ incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/pom.xml Mon Mar 15 19:42:55 2010 @@ -84,6 +84,14 @@ geronimo-jta_1.1_spec + org.apache.geronimo.components + geronimo-transaction + + + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec + + org.apache.openjpa openjpa @@ -103,10 +111,17 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.serp + + + asm + asm-all + 3.2 + org.apache.felix org.apache.felix.fileinstall @@ -153,6 +168,10 @@ org.apache.aries.transaction.manager + org.apache.aries.transaction + org.apache.aries.transaction.wrappers + + org.apache.aries.application org.apache.aries.application.install Modified: incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=923407&r1=923406&r2=923407&view=diff ============================================================================== --- incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini (original) +++ incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini Mon Mar 15 19:42:55 2010 @@ -1,6 +1,7 @@ osgi.bundles=\ cm-3.2.0-v20070116.jar@start,\ services-3.1.200-v20070605.jar@start,\ +asm-all-3.2.jar@start,\ pax-logging-api-1.4.jar@start,\ pax-logging-service-1.4.jar@start,\ derby-10.5.3.0_1.jar@start,\ @@ -8,10 +9,11 @@ commons-collections-3.2.1.jar@start,\ commons-lang-2.5.jar@start,\ commons-pool-1.5.4.jar@start,\ org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\ -org.apache.servicemix.bundles.cglib-2.1_3_4.jar@start,\ openjpa-2.0.0-beta2.jar@start,\ +geronimo-j2ee-connector_1.5_spec-2.0.0.jar@start,\ geronimo-jpa_2.0_spec-1.0.jar@start,\ geronimo-jta_1.1_spec-1.1.1.jar@start,\ +geronimo-transaction-2.1.3.jar@start,\ pax-web-jetty-bundle-0.7.2.jar@start,\ pax-web-extender-war-0.7.2.jar@start,\ pax-web-jsp-0.7.2.jar@start,\ @@ -30,6 +32,7 @@ org.apache.aries.util-${ariesUtilVersion org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\ org.apache.aries.transaction.blueprint-${ariesTransactionVersion}.jar@start,\ org.apache.aries.transaction.manager-${ariesTransactionVersion}.jar@start,\ +org.apache.aries.transaction.wrappers-${ariesTransactionVersion}.jar@start,\ org.apache.aries.samples.ariestrader.derby.ds-${version}.jar@start eclipse.ignoreApp=true org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG \ No newline at end of file Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java?rev=923407&r1=923406&r2=923407&view=diff ============================================================================== --- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java (original) +++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java Mon Mar 15 19:42:55 2010 @@ -46,8 +46,6 @@ import java.sql.Statement; public class TradeDBManagerImpl implements TradeDBManager { - private static String dsName = TradeConfig.DS_NAME; - private DataSource dataSource = null; private static InitialContext context; @@ -386,7 +384,6 @@ public class TradeDBManagerImpl implemen */ private void lookupDataSource() throws Exception { if (dataSource == null) { -// dataSource = (DataSource) ServiceUtilities.getOSGIService(DataSource.class.getName(),"(osgi.jndi.serviceName=jdbc/TradeDataSource)"); dataSource = (DataSource) ServiceUtilities.getOSGIService(DataSource.class.getName(),TradeConfig.OSGI_DS_NAME_FILTER); } } Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml?rev=923407&r1=923406&r2=923407&view=diff ============================================================================== --- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml (original) +++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml Mon Mar 15 19:42:55 2010 @@ -32,15 +32,18 @@ - org.eclipse - osgi - provided - - org.apache.derby derby provided + + org.apache.aries.transaction + org.apache.aries.transaction.blueprint + + + org.apache.geronimo.components + geronimo-transaction + @@ -52,19 +55,6 @@ ${pom.artifactId} ${pom.version} - org.apache.aries.samples.ariestrader.datasource.derby.DerbyActivator - javax.sql.DataSource - - - - - org.osgi.framework, - javax.sql, - org.apache.derby.jdbc - - - org.apache.aries.samples.ariestrader.datasource.derby - Added: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/blueprint/blueprint.xml URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=923407&view=auto ============================================================================== --- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/blueprint/blueprint.xml (added) +++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Mar 15 19:42:55 2010 @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/blueprint/blueprint.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/blueprint/blueprint.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-derby-ds/src/main/resources/OSGI-INF/blueprint/blueprint.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml?rev=923407&r1=923406&r2=923407&view=diff ============================================================================== --- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml (original) +++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml Mon Mar 15 19:42:55 2010 @@ -19,8 +19,8 @@ org.apache.openjpa.persistence.PersistenceProviderImpl - aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/TradeDataSource) - aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/NoTxTradeDataSource) + aries:services/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/TradeDataSource) + aries:services/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/NoTxTradeDataSource) org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl org.apache.aries.samples.ariestrader.entities.AccountProfileDataBeanImpl @@ -38,8 +38,10 @@ org.apache.openjpa.persistence.PersistenceProviderImpl - aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/TradeDataSource) - aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/NoTxTradeDataSource) + + + aries:services/javax.sql.DataSource/(xa.aware=true) + aries:services/javax.sql.DataSource/(xa.aware=false) org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl org.apache.aries.samples.ariestrader.entities.AccountProfileDataBeanImpl Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java?rev=923407&r1=923406&r2=923407&view=diff ============================================================================== --- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java (original) +++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java Mon Mar 15 19:42:55 2010 @@ -69,8 +69,6 @@ import java.sql.Timestamp; public class TradeJdbc implements TradeServices { - private static String dsName = TradeConfig.DS_NAME; - private DataSource dataSource= null; private static BigDecimal ZERO = new BigDecimal(0.0); @@ -1482,7 +1480,6 @@ public class TradeJdbc implements TradeS */ private void lookupDataSource() throws Exception { if (dataSource == null) { -// dataSource = (DataSource) ServiceUtilities.getOSGIService(DataSource.class.getName(),"(osgi.jndi.serviceName=jdbc/TradeDataSource)"); dataSource = (DataSource) ServiceUtilities.getOSGIService(DataSource.class.getName(),TradeConfig.OSGI_DS_NAME_FILTER); } } Modified: incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java?rev=923407&r1=923406&r2=923407&view=diff ============================================================================== --- incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java (original) +++ incubator/aries/trunk/samples/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java Mon Mar 15 19:42:55 2010 @@ -89,11 +89,10 @@ public class TradeConfig { /* Trade Database specific paramters */ public static String JDBC_UID = null; public static String JDBC_PWD = null; - public static String DS_NAME = "java:comp/env/jdbc/TradeDataSource"; /* OSGi specific parameters */ public static String OSGI_SERVICE_PREFIX = "aries:services/"; - public static String OSGI_DS_NAME_FILTER = "(osgi.jndi.serviceName=jdbc/TradeDataSource)"; + public static String OSGI_DS_NAME_FILTER = "(osgi.jndi.service.name=jdbc/NoTxTradeDataSource)"; /*Trade SOAP specific parameters */ private static String SoapURL =