You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2010/02/04 19:39:36 UTC
svn commit: r906601 - in /geronimo/sandbox/jbohn/daytrader-bp-new/modules:
./ daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/
daytrader-core/src/main/resources/OSGI-INF/blueprint/
daytrader-persist-jdbc/src/main/java/org/apache...
Author: jbohn
Date: Thu Feb 4 18:39:36 2010
New Revision: 906601
URL: http://svn.apache.org/viewvc?rev=906601&view=rev
Log:
use consistent datasource constant and eliminate duplicate name
Modified:
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJdbc.java
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java
geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java?rev=906601&r1=906600&r2=906601&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBManagerImpl.java Thu Feb 4 18:39:36 2010
@@ -45,7 +45,7 @@
public class TradeDBManagerImpl implements TradeDBManager {
- private static String dsName = TradeConfig.DATASOURCE;
+ private static String dsName = TradeConfig.DS_NAME;
private DataSource dataSource = null;
@@ -381,7 +381,7 @@
}
/*
- * Lookup the TradeData datasource
+ * Lookup the TradeData DataSource
*/
private void lookupDataSource() throws Exception {
if (dataSource == null) {
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=906601&r1=906600&r2=906601&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Thu Feb 4 18:39:36 2010
@@ -8,8 +8,13 @@
</bean>
<service id="TradeServicesManager" ref="tradeServicesManagerBean" interface="org.apache.geronimo.samples.daytrader.api.TradeServicesManager"/>
-
+<!--
+ <bean id="datasource" class="org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource">
+ <property name="databaseName" value="tradeDB"/>
+ </bean>
+-->
<bean id="tradeDBManagerBean" class="org.apache.geronimo.samples.daytrader.core.TradeDBManagerImpl" init-method="init">
+ <!--<property name="dataSource" ref="datasource" />-->
</bean>
<service id="TradeDBManager" ref="tradeDBManagerBean" interface="org.apache.geronimo.samples.daytrader.api.TradeDBManager">
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJdbc.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJdbc.java?rev=906601&r1=906600&r2=906601&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJdbc.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/src/main/java/org/apache/geronimo/samples/daytrader/persist/jdbc/TradeJdbc.java Thu Feb 4 18:39:36 2010
@@ -68,7 +68,7 @@
public class TradeJdbc implements TradeServices {
- private static String dsName = TradeConfig.DATASOURCE;
+ private static String dsName = TradeConfig.DS_NAME;
private DataSource dataSource = null;
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java?rev=906601&r1=906600&r2=906601&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java Thu Feb 4 18:39:36 2010
@@ -99,7 +99,6 @@
public static boolean JDBCDriverNeedsGlobalTransaction = false;
/* Trade Config Miscellaneous itmes */
- public static String DATASOURCE = "java:comp/env/jdbc/TradeDataSource";
public static int KEYBLOCKSIZE = 1000;
public static int QUOTES_PER_PAGE = 10;
public static boolean RND_USER = true;
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml?rev=906601&r1=906600&r2=906601&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml Thu Feb 4 18:39:36 2010
@@ -32,14 +32,14 @@
<modules>
<module>daytrader-util</module>
- <module>daytrader-beans</module>
- <module>daytrader-entities</module>
<module>daytrader-api</module>
<module>daytrader-core</module>
+ <module>daytrader-web</module>
+ <module>daytrader-beans</module>
+ <module>daytrader-entities</module>
<module>daytrader-persist-jdbc</module>
<module>daytrader-persist-jpa-am</module>
<module>daytrader-persist-jpa-cm</module>
- <module>daytrader-web</module>
</modules>
</project>