Author: jbohn
Date: Thu Dec 3 20:23:31 2009
New Revision: 886905
URL: http://svn.apache.org/viewvc?rev=886905&view=rev
Log:
cleanup, add namespaces, etc...
Modified:
geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/TradeJDBCDirect.java
geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/listener.xml
Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java?rev=886905&r1=886904&r2=886905&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
Thu Dec 3 20:23:31 2009
@@ -209,7 +209,7 @@
/**
* Unbind a TradeDBServices implementation
*/
- public void unbindDBService(TradeServices tradeDBServices, Map props) {
+ public void unbindDBService(TradeDBServices tradeDBServices, Map props) {
if (Log.doTrace())
Log.trace("TradeServicesManagerImpl:unbindDBService()", tradeDBServices, props);
if (tradeDBServices != null) {
Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/TradeJDBCDirect.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/TradeJDBCDirect.java?rev=886905&r1=886904&r2=886905&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/TradeJDBCDirect.java
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/TradeJDBCDirect.java
Thu Dec 3 20:23:31 2009
@@ -66,17 +66,19 @@
private boolean inSession = false;
+ private static InitialContext context;
+
/**
* Zero arg constructor for TradeJDBCDirect
*/
public TradeJDBCDirect() {
- if (initialized == false)
- init();
+// if (initialized == false)
+// init();
}
public TradeJDBCDirect(boolean inSession) {
- if (initialized == false)
- init();
+// if (initialized == false)
+// init();
this.inSession = inSession;
}
@@ -1776,6 +1778,7 @@
* Lookup the TradeData datasource
*/
private void getDataSource() throws Exception {
+ context = new InitialContext();
datasource = (DataSource) context.lookup(dsName);
}
@@ -1955,15 +1958,15 @@
return;
if (Log.doTrace())
Log.trace("TradeJDBCDirect:init -- *** initializing");
- try {
- if (Log.doTrace())
- Log.trace("TradeJDBCDirect: init");
- context = new InitialContext();
- datasource = (DataSource) context.lookup(dsName);
- } catch (Exception e) {
- Log.error("TradeJDBCDirect:init -- error on JNDI lookups of DataSource -- TradeJDBCDirect
will not work", e);
- return;
- }
+// try {
+// if (Log.doTrace())
+// Log.trace("TradeJDBCDirect: init");
+// context = new InitialContext();
+// datasource = (DataSource) context.lookup(dsName);
+// } catch (Exception e) {
+// Log.error("TradeJDBCDirect:init -- error on JNDI lookups of DataSource -- TradeJDBCDirect
will not work", e);
+// return;
+// }
TradeConfig.setPublishQuotePriceChange(false);
@@ -1983,8 +1986,6 @@
}
}
- private static InitialContext context;
-
/**
* Gets the inGlobalTxn
*
Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=886905&r1=886904&r2=886905&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Thu Dec 3 20:23:31 2009
@@ -1,4 +1,6 @@
-<blueprint>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<bean id="tradeServicesBeanJDBC" class="org.apache.geronimo.samples.daytrader.core.direct.TradeJDBCDirect"
activation="lazy" init-method="init"/>
Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/listener.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/listener.xml?rev=886905&r1=886904&r2=886905&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/listener.xml
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/resources/OSGI-INF/blueprint/listener.xml
Thu Dec 3 20:23:31 2009
@@ -1,4 +1,6 @@
-<blueprint>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<bean id="tradeServicesManagerBean" class="org.apache.geronimo.samples.daytrader.core.TradeServicesManagerImpl"
activation="lazy" init-method="init">
<!--<property name="tradeServicesList" ref="tradeServicesList"/>-->
|