You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/02/02 22:08:17 UTC
svn commit: r905798 - in /incubator/aries/trunk/ariestrader-sample/modules:
ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/
ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/
Author: jbohn
Date: Tue Feb 2 21:08:16 2010
New Revision: 905798
URL: http://svn.apache.org/viewvc?rev=905798&view=rev
Log:
support lookup of datasource if not injected in sample
Modified:
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java
incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJDBCDirect.java
Modified: incubator/aries/trunk/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/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java?rev=905798&r1=905797&r2=905798&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java Tue Feb 2 21:08:16 2010
@@ -47,8 +47,7 @@
private static String dsName = TradeConfig.DATASOURCE;
-// private static DataSource dataSource = null;
- private DataSource dataSource;
+ private DataSource dataSource = null;
private static InitialContext context;
@@ -384,12 +383,12 @@
/*
* Lookup the TradeData DataSource
*/
-// private void getDataSource() throws Exception {
-// if (dataSource == null) {
-// context = new InitialContext();
-// dataSource = (DataSource) context.lookup(dsName);
-// }
-// }
+ private void lookupDataSource() throws Exception {
+ if (dataSource == null) {
+ context = new InitialContext();
+ dataSource = (DataSource) context.lookup(dsName);
+ }
+ }
/*
* Allocate a new connection to the datasource
@@ -397,7 +396,7 @@
private Connection getConn() throws Exception {
Connection conn = null;
-// getDataSource();
+ lookupDataSource();
conn = dataSource.getConnection();
conn.setAutoCommit(false);
if (Log.doTrace()) {
Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJDBCDirect.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJDBCDirect.java?rev=905798&r1=905797&r2=905798&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJDBCDirect.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJDBCDirect.java Tue Feb 2 21:08:16 2010
@@ -70,8 +70,7 @@
private static String dsName = TradeConfig.DATASOURCE;
-// private static DataSource dataSource = null;
- private DataSource dataSource;
+ private DataSource dataSource= null;
private static BigDecimal ZERO = new BigDecimal(0.0);
@@ -1480,12 +1479,12 @@
/*
* Lookup the TradeData DataSource
*/
-// private void getDataSource() throws Exception {
-// if (dataSource == null) {
-// context = new InitialContext();
-// dataSource = (DataSource) context.lookup(dsName);
-// }
-// }
+ private void lookupDataSource() throws Exception {
+ if (dataSource == null) {
+ context = new InitialContext();
+ dataSource = (DataSource) context.lookup(dsName);
+ }
+ }
/*
* Allocate a new connection to the datasource
@@ -1493,7 +1492,7 @@
private Connection getConn() throws Exception {
Connection conn = null;
-// getDataSource();
+ lookupDataSource();
conn = dataSource.getConnection();
conn.setAutoCommit(false);
if (Log.doTrace()) {