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/04 19:48:50 UTC

svn commit: r906604 - 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/ ariestrad...

Author: jbohn
Date: Thu Feb  4 18:48:49 2010
New Revision: 906604

URL: http://svn.apache.org/viewvc?rev=906604&view=rev
Log:
some cleanup of datasource references - still more to do

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/TradeJdbc.java
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java
    incubator/aries/trunk/ariestrader-sample/modules/pom.xml

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=906604&r1=906603&r2=906604&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 Thu Feb  4 18:48:49 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;
 

Modified: incubator/aries/trunk/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/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java?rev=906604&r1=906603&r2=906604&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java Thu Feb  4 18:48:49 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: incubator/aries/trunk/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/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java?rev=906604&r1=906603&r2=906604&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/TradeConfig.java Thu Feb  4 18:48:49 2010
@@ -98,8 +98,7 @@
 	/*Trade XA Datasource specific parameters */
 	public static boolean JDBCDriverNeedsGlobalTransaction = false;
 
-	/* Trade Config Miscellaneous itmes */
-	public static String DATASOURCE = "java:comp/env/jdbc/TradeDataSource";
+	/* Trade Config Miscellaneous items */
 	public static int KEYBLOCKSIZE = 1000;
 	public static int QUOTES_PER_PAGE = 10;
 	public static boolean RND_USER = true;

Modified: incubator/aries/trunk/ariestrader-sample/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/pom.xml?rev=906604&r1=906603&r2=906604&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/pom.xml Thu Feb  4 18:48:49 2010
@@ -34,11 +34,11 @@
         <module>ariestrader-util</module>
         <module>ariestrader-api</module>
         <module>ariestrader-core</module>
+        <module>ariestrader-web</module>
         <module>ariestrader-beans</module>
-        <module>ariestrader-persist-jdbc</module>
         <module>ariestrader-entities</module>
+        <module>ariestrader-persist-jdbc</module>
         <module>ariestrader-persist-jpa-am</module>
-        <module>ariestrader-web</module>
     </modules>
 
 </project>