geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cjbly...@apache.org
Subject svn commit: r569494 [1/3] - in /geronimo/daytrader/trunk: modules/ear/ modules/ejb/ modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/ modules/ejb/src/main/java/org/a...
Date Fri, 24 Aug 2007 19:49:17 GMT
Author: cjblythe
Date: Fri Aug 24 12:49:14 2007
New Revision: 569494

URL: http://svn.apache.org/viewvc?rev=569494&view=rev
Log:
DAYTRADER-53 Removing all EJB 2.1 components and making DT 2.0 EE 5 only

Removed:
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/session/
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2EntityLocal.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2EntityRemote.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2MDBQueue.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2MDBTopic.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Session.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Session2CMROne2Many.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Session2CMROne2One.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Session2Entity.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Session2EntityCollection.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Session2JDBC.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2Session2JDBCCollection.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingServlet2TwoPhase.java
Modified:
    geronimo/daytrader/trunk/modules/ear/pom.xml
    geronimo/daytrader/trunk/modules/ejb/pom.xml
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTStreamer3MDB.java
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml
    geronimo/daytrader/trunk/modules/streamer/pom.xml
    geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClient.java
    geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClientMessageListener.java
    geronimo/daytrader/trunk/modules/streamer/src/main/resources/META-INF/application-client.xml
    geronimo/daytrader/trunk/modules/web/pom.xml
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBQueue.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBTopic.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2TwoPhase.java
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html
    geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html
    geronimo/daytrader/trunk/modules/wsappclient/pom.xml
    geronimo/daytrader/trunk/modules/wsappclient/src/main/java/org/apache/geronimo/samples/daytrader/client/ws/ClientApp.java
    geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml
    geronimo/daytrader/trunk/plans/dayTrader-db2-plan.xml
    geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml
    geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml

Modified: geronimo/daytrader/trunk/modules/ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ear/pom.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Fri Aug 24 12:49:14 2007
@@ -68,7 +68,7 @@
                 <configuration>
                     <displayName>DayTrader 2.0</displayName>
                     <description>DayTrader Stock Trading Performance Benchmark Sample</description>
-                    <version>1.4</version>
+                    <version>5</version>
                     <modules>
                         <webModule>
                             <groupId>org.apache.geronimo.daytrader</groupId>

Modified: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/pom.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Fri Aug 24 12:49:14 2007
@@ -45,22 +45,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java Fri Aug 24 12:49:14 2007
@@ -22,10 +22,8 @@
 import javax.naming.InitialContext;
 
 import org.apache.geronimo.samples.daytrader.direct.TradeDirect;
-import org.apache.geronimo.samples.daytrader.ejb.TradeHome;
 import org.apache.geronimo.samples.daytrader.ejb3.TradeSLSBRemote;
 import org.apache.geronimo.samples.daytrader.ejb3.DirectSLSBRemote;
-import org.apache.geronimo.samples.daytrader.session.TradeJDBCHome;
 import org.apache.geronimo.samples.daytrader.util.FinancialUtils;
 import org.apache.geronimo.samples.daytrader.util.Log;
 
@@ -42,9 +40,6 @@
     // - ejb3 mode is the only thing that really uses this
     // - can go back and update other modes to take advantage (ie. TradeDirect)
     private static TradeServices trade = null;
-    private static TradeHome tradeHome = null;
-    private static TradeJDBCHome tradeJDBCHome = null;
-
 
     public TradeAction() {
         if (Log.doTrace())
@@ -59,25 +54,7 @@
     }
 
     private void createTrade() {
-        if (TradeConfig.runTimeMode == TradeConfig.EJB) {
-            try {
-                if (tradeHome == null) {
-                    InitialContext ic = new InitialContext();
-                    try {
-                        tradeHome = (TradeHome) (javax.rmi.PortableRemoteObject.narrow(ic.lookup("java:comp/env/ejb/Trade"), TradeHome.class));
-                    }
-                    catch (Exception e) {
-                        Log.log("TradeAction:createTrade lookup of java:comp/env/ejb/Trade failed. Reverting to JNDI lookup of Trade");
-                        tradeHome = (TradeHome) (javax.rmi.PortableRemoteObject.narrow(ic.lookup("Trade"), TradeHome.class));
-                    }
-                }
-                trade = tradeHome.create();
-            }
-            catch (Exception e) {
-                Log.error("TradeAction:TradeAction() Creation of Trade EJB failed\n" + e);
-                e.printStackTrace();
-            }
-        } else if (TradeConfig.runTimeMode == TradeConfig.EJB3) {
+        if (TradeConfig.runTimeMode == TradeConfig.EJB3) {
             try {
                 if (!(trade instanceof TradeSLSBRemote)) {
                     TradeSLSBRemote tradeSLSB = null;
@@ -121,24 +98,6 @@
             }
             catch (Exception e) {
                 Log.error("TradeAction:TradeAction() Creation of Trade Direct failed\n" + e);
-            }
-        } else if (TradeConfig.runTimeMode == TradeConfig.SESSION) {
-            try {
-                if (tradeJDBCHome == null) {
-                    InitialContext ic = new InitialContext();
-                    try {
-                        tradeJDBCHome = (TradeJDBCHome) (javax.rmi.PortableRemoteObject.narrow(ic.lookup("java:comp/env/ejb/TradeJDBC"), TradeJDBCHome.class));
-                    }
-                    catch (Exception e) {
-                        Log.log("TradeAction:createTrade lookup of java:comp/env/ejb/TradeJDBC failed. Reverting to JNDI lookup of Trade");
-                        tradeJDBCHome = (TradeJDBCHome) (javax.rmi.PortableRemoteObject.narrow(ic.lookup("TradeJDBC"), TradeJDBCHome.class));
-                    }
-                }
-                trade = tradeJDBCHome.create();
-            }
-            catch (Exception e) {
-                Log.error("TradeAction:TradeAction() Creation of Trade JDBC failed\n" + e);
-                e.printStackTrace();
             }
         }
     }

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java Fri Aug 24 12:49:14 2007
@@ -34,12 +34,10 @@
 	/* Trade Runtime Configuration Parameters */
 
 	/* Trade Runtime Mode parameters */
-	public static String[] runTimeModeNames = { "EJB", "Direct", "SessionDirect", "EJB3", "SessionDirect3" };
-	public static final int EJB = 0;
-	public static final int DIRECT = 1;
-	public static final int SESSION = 2;
-    public static final int EJB3 = 3;
-    public static final int SESSION3 = 4;
+	public static String[] runTimeModeNames = {"Direct (JDBC)", "Session (EJB3) To Direct", "Full EJB3"};
+	public static final int DIRECT = 0;
+    public static final int SESSION3 = 1;
+    public static final int EJB3 = 2;
 	public static int runTimeMode = DIRECT;
 
 	public static String[] orderProcessingModeNames =

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java Fri Aug 24 12:49:14 2007
@@ -2206,10 +2206,10 @@
 
 		try {
 			queue = (Queue) context
-					.lookup("java:comp/env/jms/TradeBrokerQueue");
+					.lookup("java:comp/env/jms/DTBrokerQueue3");
 		} catch (Exception e) {
 			Log
-					.error("TradeDirect:init  Unable to locate TradeBrokerQueue.\n\t -- Asynchronous mode will not work correctly and Quote Price change publishing will be disabled");
+					.error("TradeDirect:init  Unable to locate DTBrokerQueue3.\n\t -- Asynchronous mode will not work correctly and Quote Price change publishing will be disabled");
 			TradeConfig.setPublishQuotePriceChange(false);
 		}
 
@@ -2224,10 +2224,10 @@
 
 		try {
 			streamerTopic = (Topic) context
-					.lookup("java:comp/env/jms/TradeStreamerTopic");
+					.lookup("java:comp/env/jms/DTStreamerTopic3");
 		} catch (Exception e) {
 			Log
-					.error("TradeDirect:init  Unable to locate TradeStreamerTopic.\n\t -- Asynchronous mode will not work correctly and Quote Price change publishing will be disabled");
+					.error("TradeDirect:init  Unable to locate DTStreamerTopic3.\n\t -- Asynchronous mode will not work correctly and Quote Price change publishing will be disabled");
 			TradeConfig.setPublishQuotePriceChange(false);
 		}
 

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java Fri Aug 24 12:49:14 2007
@@ -22,6 +22,10 @@
 import javax.ejb.EJB;
 import javax.ejb.MessageDriven;
 import javax.ejb.MessageDrivenContext;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.TransactionManagementType;
 import javax.jms.Message;
 import javax.jms.MessageListener;
 import javax.jms.TextMessage;
@@ -31,10 +35,13 @@
 import org.apache.geronimo.samples.daytrader.util.MDBStats;
 import org.apache.geronimo.samples.daytrader.util.TimerStat;
 
+@TransactionAttribute(TransactionAttributeType.REQUIRED)
+@TransactionManagement(TransactionManagementType.CONTAINER)
 @MessageDriven(activationConfig =  {
         @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"),
         @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName = "destination", propertyValue = "DTBrokerQueue3")
+        @ActivationConfigProperty(propertyName = "destination", propertyValue = "DTBrokerQueue3"),
+        @ActivationConfigProperty(propertyName = "subscriptionDurability", propertyValue = "NonDurable")
     })
 public class DTBroker3MDB implements MessageListener {
     private MDBStats mdbStats;

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTStreamer3MDB.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTStreamer3MDB.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTStreamer3MDB.java (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTStreamer3MDB.java Fri Aug 24 12:49:14 2007
@@ -21,6 +21,10 @@
 import javax.ejb.ActivationConfigProperty;
 import javax.ejb.MessageDriven;
 import javax.ejb.MessageDrivenContext;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.TransactionManagementType;
 import javax.jms.Message;
 import javax.jms.MessageListener;
 import javax.jms.TextMessage;
@@ -28,11 +32,13 @@
 import org.apache.geronimo.samples.daytrader.util.MDBStats;
 import org.apache.geronimo.samples.daytrader.util.TimerStat;
 
-
+@TransactionAttribute(TransactionAttributeType.REQUIRED)
+@TransactionManagement(TransactionManagementType.CONTAINER)
 @MessageDriven(activationConfig =  {
         @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"),
         @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"),
-        @ActivationConfigProperty(propertyName = "destination", propertyValue = "DTStreamerTopic3")
+        @ActivationConfigProperty(propertyName = "destination", propertyValue = "DTStreamerTopic3"),
+        @ActivationConfigProperty(propertyName = "subscriptionDurability", propertyValue = "NonDurable")
     })
 public class DTStreamer3MDB implements MessageListener {
     

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java Fri Aug 24 12:49:14 2007
@@ -63,10 +63,10 @@
     @Resource(name = "jms/TopicConnectionFactory")
     private TopicConnectionFactory topicConnectionFactory;
 
-    @Resource(name = "DTStreamerTopic3")
+    @Resource(name = "jms/DTStreamerTopic3")
     private Topic tradeStreamerTopic;
 
-    @Resource(name = "DTBrokerQueue3")
+    @Resource(name = "jms/DTBrokerQueue3")
     private Queue tradeBrokerQueue;
 
     @PersistenceContext

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml Fri Aug 24 12:49:14 2007
@@ -19,1080 +19,10 @@
     xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"> 
     <display-name>DayTrader Enterprise Bean Definitions</display-name>
-    <enterprise-beans>
-    <!--
-     **
-     **  S e s s i o n   B e a n   D e f i n i t i o n s
-     ** 
-     -->
-
-
-        <!-- 
-         **
-         **  K e y S e q u e n c e E J B
-         ** 
-         -->
-        <session>
-            <display-name>KeySequenceEJB</display-name>
-            <ejb-name>KeySequenceEJB</ejb-name>
-            <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalKeySequenceHome</local-home>
-            <local>org.apache.geronimo.samples.daytrader.ejb.LocalKeySequence</local>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.KeySequenceBean</ejb-class>
-            <session-type>Stateless</session-type>
-            <transaction-type>Container</transaction-type>
-            <ejb-local-ref>
-                <ejb-ref-name>ejb/KeyGen</ejb-ref-name>
-                <ejb-ref-type>Entity</ejb-ref-type>
-                <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalKeyGenHome</local-home>
-                <local>org.apache.geronimo.samples.daytrader.ejb.LocalKeyGen</local>
-                <ejb-link>KeyGenEJB</ejb-link>
-            </ejb-local-ref>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-        </session>
-
-        <!--
-          **
-          **  T r a d e E J B
-          ** 
-         -->
-        <session>
-            <description>Trade Session EJB manages all Trading services</description>
-            <display-name>TradeEJB</display-name>
-            <ejb-name>TradeEJB</ejb-name>
-            <home>org.apache.geronimo.samples.daytrader.ejb.TradeHome</home>
-            <remote>org.apache.geronimo.samples.daytrader.ejb.Trade</remote>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.TradeBean</ejb-class>
-            <session-type>Stateless</session-type>
-            <transaction-type>Container</transaction-type>
-            <env-entry>
-                <env-entry-name>orderBySQLSupported</env-entry-name>
-                <env-entry-type>java.lang.Boolean</env-entry-type>
-                <env-entry-value>true</env-entry-value>
-            </env-entry>
-            <env-entry>
-                <env-entry-name>updateQuotePrices</env-entry-name>
-                <env-entry-type>java.lang.Boolean</env-entry-type>
-                <env-entry-value>true</env-entry-value>
-            </env-entry>
-            <ejb-ref>
-                <ejb-ref-name>ejb/Trade</ejb-ref-name>
-                <ejb-ref-type>Session</ejb-ref-type>
-                <home>org.apache.geronimo.samples.daytrader.ejb.TradeHome</home>
-                <remote>org.apache.geronimo.samples.daytrader.ejb.Trade</remote>
-                <ejb-link>TradeEJB</ejb-link>
-            </ejb-ref>
-            <ejb-local-ref>
-                <ejb-ref-name>ejb/Quote</ejb-ref-name>
-                <ejb-ref-type>Entity</ejb-ref-type>
-                <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalQuoteHome</local-home>
-                <local>org.apache.geronimo.samples.daytrader.ejb.LocalQuote</local>
-                <ejb-link>QuoteEJB</ejb-link>
-            </ejb-local-ref>
-            <ejb-local-ref>
-                <ejb-ref-name>ejb/Account</ejb-ref-name>
-                <ejb-ref-type>Entity</ejb-ref-type>
-                <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalAccountHome</local-home>
-                <local>org.apache.geronimo.samples.daytrader.ejb.LocalAccount</local>
-                <ejb-link>AccountEJB</ejb-link>
-            </ejb-local-ref>
-            <ejb-local-ref>
-                <ejb-ref-name>ejb/Holding</ejb-ref-name>
-                <ejb-ref-type>Entity</ejb-ref-type>
-                <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalHoldingHome</local-home>
-                <local>org.apache.geronimo.samples.daytrader.ejb.LocalHolding</local>
-                <ejb-link>HoldingEJB</ejb-link>
-            </ejb-local-ref>
-            <ejb-local-ref>
-                <ejb-ref-name>ejb/Order</ejb-ref-name>
-                <ejb-ref-type>Entity</ejb-ref-type>
-                <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalOrderHome</local-home>
-                <local>org.apache.geronimo.samples.daytrader.ejb.LocalOrder</local>
-                <ejb-link>OrderEJB</ejb-link>
-            </ejb-local-ref>
-            <ejb-local-ref>
-                <ejb-ref-name>ejb/KeySequence</ejb-ref-name>
-                <ejb-ref-type>Session</ejb-ref-type>
-                <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalKeySequenceHome</local-home>
-                <local>org.apache.geronimo.samples.daytrader.ejb.LocalKeySequence</local>
-                <ejb-link>KeySequenceEJB</ejb-link>
-            </ejb-local-ref>
-            <ejb-local-ref>
-                <ejb-ref-name>ejb/AccountProfile</ejb-ref-name>
-                <ejb-ref-type>Entity</ejb-ref-type>
-                <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalAccountProfileHome</local-home>
-                <local>org.apache.geronimo.samples.daytrader.ejb.LocalAccountProfile</local>
-                <ejb-link>AccountProfileEJB</ejb-link>
-            </ejb-local-ref>
-            <resource-ref>
-                <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
-                <res-type>javax.jms.QueueConnectionFactory</res-type>
-                <res-auth>Application</res-auth>
-                <res-sharing-scope>Shareable</res-sharing-scope>
-            </resource-ref>
-            <resource-ref>
-                <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
-                <res-type>javax.jms.TopicConnectionFactory</res-type>
-                <res-auth>Application</res-auth>
-                <res-sharing-scope>Shareable</res-sharing-scope>
-            </resource-ref>
-            <resource-ref>
-                <res-ref-name>jdbc/TradeDataSource</res-ref-name>
-                <res-type>javax.sql.DataSource</res-type>
-                <res-auth>Container</res-auth>
-                <res-sharing-scope>Shareable</res-sharing-scope>
-            </resource-ref>
-            <message-destination-ref>
-                <!--  JNDI Name -->
-                <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
-                <message-destination-type>javax.jms.Queue</message-destination-type>
-                <message-destination-usage>Produces</message-destination-usage>
-                <message-destination-link>TradeBrokerQueue</message-destination-link>
-            </message-destination-ref>
-            <message-destination-ref>
-                <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
-                <message-destination-type>javax.jms.Topic</message-destination-type>
-                <message-destination-usage>Produces</message-destination-usage>
-                <message-destination-link>TradeStreamerTopic</message-destination-link>
-            </message-destination-ref>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-        </session>
-
-        
-        <!--
-          **
-          **  T r a d e J D B C
-          ** 
-         -->
-        <session>
-            <description>Trade JDBC Session EJB manages all Trading services</description>
-            <display-name>TradeJDBC</display-name>
-            <ejb-name>TradeJDBC</ejb-name>
-            <home>org.apache.geronimo.samples.daytrader.session.TradeJDBCHome</home>
-            <remote>org.apache.geronimo.samples.daytrader.session.TradeJDBC</remote>
-            <ejb-class>org.apache.geronimo.samples.daytrader.session.TradeJDBCBean</ejb-class>
-            <session-type>Stateless</session-type>
-            <transaction-type>Container</transaction-type>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-        </session>
-
-    <!-- 
-     **
-     **     C o n t a i n e r   M a n a g e d   P e r s i s t e n c e   E J B s
-     **
-     -->
-
-        <!--
-          **
-          **  A c c o u n t E J B
-          ** 
-         -->
-        <entity>
-            <display-name>AccountEJB</display-name>
-            <ejb-name>AccountEJB</ejb-name>
-            <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalAccountHome</local-home>
-            <local>org.apache.geronimo.samples.daytrader.ejb.LocalAccount</local>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.AccountBean</ejb-class>
-            <persistence-type>Container</persistence-type>
-            <prim-key-class>java.lang.Integer</prim-key-class>
-            <reentrant>false</reentrant>
-            <cmp-version>2.x</cmp-version>
-            <abstract-schema-name>Account</abstract-schema-name>
-            <cmp-field>
-                <field-name>creationDate</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>openBalance</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>logoutCount</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>balance</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>accountID</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>lastLogin</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>loginCount</field-name>
-            </cmp-field>
-            <primkey-field>accountID</primkey-field>
-            <ejb-local-ref>
-                <ejb-ref-name>ejb/AccountProfile</ejb-ref-name>
-                <ejb-ref-type>Entity</ejb-ref-type>
-                <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalAccountProfileHome</local-home>
-                <local>org.apache.geronimo.samples.daytrader.ejb.LocalAccountProfile</local>
-                <ejb-link>AccountProfileEJB</ejb-link>
-            </ejb-local-ref>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findByUserID</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <ejb-ql>SELECT OBJECT(a) FROM Account a WHERE
-                    a.profile.userID = ?1</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findAll</method-name>
-                    <method-params/>
-                </query-method>
-                <ejb-ql>SELECT OBJECT(a) FROM Account a</ejb-ql>
-            </query>
-            <query>
-                <query-method>
-                    <method-name>findByUserIDForUpdate</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(a) FROM Account a WHERE
-                    a.profile.userID = ?1</ejb-ql>
-            </query>
-            <query>
-                <query-method>
-                    <method-name>ejbSelectClosedOrders</method-name>
-                    <method-params>
-                        <method-param>java.lang.Integer</method-param>
-                    </method-params>
-                </query-method>
-                <ejb-ql>SELECT o.orderID FROM Orders o WHERE
-                    o.orderStatus = 'closed' AND o.account.accountID  = ?1</ejb-ql>
-            </query>
-            <query>
-                <query-method>
-                    <method-name>findByPrimaryKeyForUpdate</method-name>
-                    <method-params>
-                        <method-param>java.lang.Integer</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(a) FROM Account a where
-                    a.accountID = ?1</ejb-ql>
-            </query>
-        </entity>
-
-        <!-- 
-         ** 
-         **  A c c o u n t P r o f i l e E J B
-         -->        
-        <entity>
-            <display-name>AccountProfileEJB</display-name>
-            <ejb-name>AccountProfileEJB</ejb-name>
-            <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalAccountProfileHome</local-home>
-            <local>org.apache.geronimo.samples.daytrader.ejb.LocalAccountProfile</local>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.AccountProfileBean</ejb-class>
-            <persistence-type>Container</persistence-type>
-            <prim-key-class>java.lang.String</prim-key-class>
-            <reentrant>false</reentrant>
-            <cmp-version>2.x</cmp-version>
-            <abstract-schema-name>AccountProfile</abstract-schema-name>
-            <cmp-field>
-                <field-name>address</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>passwd</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>userID</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>email</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>creditCard</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>fullName</field-name>
-            </cmp-field>
-            <primkey-field>userID</primkey-field>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findAll</method-name>
-                    <method-params/>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(a) FROM AccountProfile a</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findByPrimaryKeyForUpdate</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(a) FROM AccountProfile a where
-                    a.userID = ?1</ejb-ql>
-            </query>
-        </entity>
-        
-        <!--
-          **
-          **  H o l d i n g E J B
-          ** 
-         -->
-        <entity>
-            <display-name>HoldingEJB</display-name>
-            <ejb-name>HoldingEJB</ejb-name>
-            <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalHoldingHome</local-home>
-            <local>org.apache.geronimo.samples.daytrader.ejb.LocalHolding</local>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.HoldingBean</ejb-class>
-            <persistence-type>Container</persistence-type>
-            <prim-key-class>java.lang.Integer</prim-key-class>
-            <reentrant>false</reentrant>
-            <cmp-version>2.x</cmp-version>
-            <abstract-schema-name>Holding</abstract-schema-name>
-            <cmp-field>
-                <field-name>purchasePrice</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>holdingID</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>quantity</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>purchaseDate</field-name>
-            </cmp-field>
-            <primkey-field>holdingID</primkey-field>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>ejbSelectQuoteFromSymbol</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(q) from Quote q WHERE q.symbol = ?1</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findAll</method-name>
-                    <method-params/>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(h) from Holding h</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findByUserID</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(h) FROM Holding h WHERE
-                    h.account.profile.userID  = ?1</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findByAccountID</method-name>
-                    <method-params>
-                        <method-param>java.lang.Integer</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(h) FROM Holding h WHERE
-                    h.account.accountID  = ?1</ejb-ql>
-            </query>
-            <query>
-                <query-method>
-                    <method-name>findByPrimaryKeyForUpdate</method-name>
-                    <method-params>
-                        <method-param>java.lang.Integer</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(h) FROM Holding h WHERE
-                    h.holdingID = ?1</ejb-ql>
-            </query>
-        </entity>
-        
-        <!--
-          **
-          **  Q u o t e E J B
-          ** 
-         -->
-        <entity>
-            <description>Stock price quotes including current, open, high, low, etc.</description>
-            <display-name>QuoteEJB</display-name>
-            <ejb-name>QuoteEJB</ejb-name>
-            <home>org.apache.geronimo.samples.daytrader.ejb.QuoteHome</home>
-            <remote>org.apache.geronimo.samples.daytrader.ejb.Quote</remote>
-            <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalQuoteHome</local-home>
-            <local>org.apache.geronimo.samples.daytrader.ejb.LocalQuote</local>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.QuoteBean</ejb-class>
-            <persistence-type>Container</persistence-type>
-            <prim-key-class>java.lang.String</prim-key-class>
-            <reentrant>false</reentrant>
-            <cmp-version>2.x</cmp-version>
-            <abstract-schema-name>Quote</abstract-schema-name>
-            <cmp-field>
-                <field-name>low</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>open</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>volume</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>price</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>high</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>companyName</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>symbol</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>change</field-name>
-            </cmp-field>
-            <primkey-field>symbol</primkey-field>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findAll</method-name>
-                    <method-params/>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(q) FROM Quote q</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findQuotes</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(q) FROM Quote q</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findOne</method-name>
-                    <method-params/>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(q) FROM Quote q where q.symbol = 's:0'</ejb-ql>
-            </query>
-            <query>
-                <query-method>
-                    <method-name>findTSIAQuotesOrderByChange</method-name>
-                    <method-params/>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(q) FROM Quote q WHERE q.symbol LIKE 's:1__' ORDER BY q.change DESC</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>ejbSelectTotalVolume</method-name>
-                    <method-params/>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT q.volume FROM Quote q</ejb-ql>
-            </query>
-            <query>
-                <query-method>
-                    <method-name>findTSIAQuotes</method-name>
-                    <method-params/>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(q) FROM Quote q WHERE q.symbol LIKE 's:1__'</ejb-ql>
-            </query>
-            <query>
-                <query-method>
-                    <method-name>findByPrimaryKeyForUpdate</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(q) FROM Quote q where q.symbol = ?1</ejb-ql>
-            </query>
-        </entity>
-
-        <!-- 
-         **
-         **  K e y G e n E J B
-         ** 
-         -->
-        <entity>
-            <display-name>KeyGenEJB</display-name>
-            <ejb-name>KeyGenEJB</ejb-name>
-            <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalKeyGenHome</local-home>
-            <local>org.apache.geronimo.samples.daytrader.ejb.LocalKeyGen</local>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.KeyGenBean</ejb-class>
-            <persistence-type>Container</persistence-type>
-            <prim-key-class>java.lang.String</prim-key-class>
-            <reentrant>false</reentrant>
-            <cmp-version>2.x</cmp-version>
-            <abstract-schema-name>KeyGen</abstract-schema-name>
-            <cmp-field>
-                <field-name>keyVal</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>keyName</field-name>
-            </cmp-field>
-            <primkey-field>keyName</primkey-field>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-            <query>
-                <query-method>
-                    <method-name>findByPrimaryKeyForUpdate</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(kg) FROM KeyGen kg where
-                    kg.keyName = ?1</ejb-ql>
-            </query>
-        </entity>
-
-        <!--
-          **
-          **  O r d e r E J B
-          ** 
-         -->
-        <entity>
-            <display-name>OrderEJB</display-name>
-            <ejb-name>OrderEJB</ejb-name>
-            <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalOrderHome</local-home>
-            <local>org.apache.geronimo.samples.daytrader.ejb.LocalOrder</local>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.OrderBean</ejb-class>
-            <persistence-type>Container</persistence-type>
-            <prim-key-class>java.lang.Integer</prim-key-class>
-            <reentrant>false</reentrant>
-            <cmp-version>2.x</cmp-version>
-            <abstract-schema-name>Orders</abstract-schema-name>
-            <cmp-field>
-                <field-name>orderFee</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>completionDate</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>orderType</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>orderStatus</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>price</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>quantity</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>openDate</field-name>
-            </cmp-field>
-            <cmp-field>
-                <field-name>orderID</field-name>
-            </cmp-field>
-            <primkey-field>orderID</primkey-field>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findAll</method-name>
-                    <method-params/>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(o) FROM Orders o</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findClosedOrders</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(o) FROM Orders o WHERE
-                    o.orderStatus = 'closed' AND
-                    o.account.profile.userID  = ?1</ejb-ql>
-            </query>
-            <query>
-                <description/>
-                <query-method>
-                    <method-name>findByUserID</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(o) FROM Orders o WHERE
-                    o.account.profile.userID  = ?1 ORDER BY o.orderID DESC</ejb-ql>
-            </query>
-            <query>
-                <query-method>
-                    <method-name>findByPrimaryKeyForUpdate</method-name>
-                    <method-params>
-                        <method-param>java.lang.Integer</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(o) FROM Orders o WHERE o.orderID = ?1</ejb-ql>
-            </query>
-            <query>
-                <query-method>
-                    <method-name>findClosedOrdersForUpdate</method-name>
-                    <method-params>
-                        <method-param>java.lang.String</method-param>
-                    </method-params>
-                </query-method>
-                <!--<result-type-mapping>Local</result-type-mapping>-->
-                <ejb-ql>SELECT OBJECT(o) FROM Orders o WHERE
-                    o.orderStatus = 'closed' AND
-                    o.account.profile.userID  = ?1</ejb-ql>
-            </query>
-        </entity>
-
-    <!-- 
-     **
-     **  M e s s a g e   D r i v e n   B e a n   D e f i n i t i o n s
-     **
-     -->
-
-        <!--
-          **
-          **  T r a d e B r o k e r M D B
-          ** 
-         -->
-        <message-driven>
-            <display-name>TradeBrokerMDB</display-name>
-            <ejb-name>TradeBrokerMDB</ejb-name>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.TradeBrokerMDB</ejb-class>
-            <messaging-type>javax.jms.MessageListener</messaging-type>
-			<transaction-type>Container</transaction-type>
-            <message-destination-type>javax.jms.Queue</message-destination-type>
-            <message-destination-link>TradeBrokerQueue</message-destination-link>
-            <env-entry>
-                <env-entry-name>statInterval</env-entry-name>
-                <env-entry-type>java.lang.Integer</env-entry-type>
-                <env-entry-value>100</env-entry-value>
-            </env-entry>
-            <ejb-ref>
-                <ejb-ref-name>ejb/Trade</ejb-ref-name>
-                <ejb-ref-type>Session</ejb-ref-type>
-                <home>org.apache.geronimo.samples.daytrader.ejb.TradeHome</home>
-                <remote>org.apache.geronimo.samples.daytrader.ejb.Trade</remote>
-                <ejb-link>TradeEJB</ejb-link>
-            </ejb-ref>
-        </message-driven>
-
-        <!--
-          **
-          **  T r a d e S t r e a m e r M D B
-          ** 
-         -->
-        <message-driven>
-            <display-name>TradeStreamerMDB</display-name>
-            <ejb-name>TradeStreamerMDB</ejb-name>
-            <ejb-class>org.apache.geronimo.samples.daytrader.ejb.TradeStreamerMDB</ejb-class>
-            <messaging-type>javax.jms.MessageListener</messaging-type>
-            <transaction-type>Container</transaction-type>
-            <message-destination-type>javax.jms.Topic</message-destination-type>
-            <message-destination-link>TradeStreamerTopic</message-destination-link>
-            <env-entry>
-                <env-entry-name>statInterval</env-entry-name>
-                <env-entry-type>java.lang.Integer</env-entry-type>
-                <env-entry-value>100</env-entry-value>
-            </env-entry>
-        </message-driven>
-    </enterprise-beans>
-    
-    <!-- 
-      **
-      **  E J B    R e l a t i o n s h i p s
-      **
-     -->
-    <relationships>
-        <ejb-relation>
-            <ejb-relation-name>Account-Orders</ejb-relation-name>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
-                <multiplicity>One</multiplicity>
-                <relationship-role-source>
-                    <ejb-name>AccountEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>orders</cmr-field-name>
-                    <cmr-field-type>java.util.Collection</cmr-field-type>
-                </cmr-field>
-            </ejb-relationship-role>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>Order-Has-Account</ejb-relationship-role-name>
-                <multiplicity>Many</multiplicity>
-                <cascade-delete/>
-                <relationship-role-source>
-                    <ejb-name>OrderEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>account</cmr-field-name>
-                </cmr-field>
-            </ejb-relationship-role>
-        </ejb-relation>
-
-        <ejb-relation>
-            <ejb-relation-name>Account-AccountProfile</ejb-relation-name>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>Account-Has-AccountProfile</ejb-relationship-role-name>
-                <multiplicity>One</multiplicity>
-                <relationship-role-source>
-                    <ejb-name>AccountEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>profile</cmr-field-name>
-                </cmr-field>
-            </ejb-relationship-role>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>AccountProfileEJB</ejb-relationship-role-name>
-                <multiplicity>One</multiplicity>
-                <cascade-delete/>
-                <relationship-role-source>
-                    <ejb-name>AccountProfileEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>account</cmr-field-name>
-                </cmr-field>
-            </ejb-relationship-role>
-        </ejb-relation>
-
-        <ejb-relation>
-            <ejb-relation-name>Account-Holdings</ejb-relation-name>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
-                <multiplicity>One</multiplicity>
-                <relationship-role-source>
-                    <ejb-name>AccountEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>holdings</cmr-field-name>
-                    <cmr-field-type>java.util.Collection</cmr-field-type>
-                </cmr-field>
-            </ejb-relationship-role>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>Holding-Has-Account</ejb-relationship-role-name>
-                <multiplicity>Many</multiplicity>
-                <cascade-delete/>
-                <relationship-role-source>
-                    <ejb-name>HoldingEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>account</cmr-field-name>
-                </cmr-field>
-            </ejb-relationship-role>
-        </ejb-relation>
-
-        <ejb-relation>
-            <ejb-relation-name>Quote-Holdings</ejb-relation-name>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>Holding-Has-Quote</ejb-relationship-role-name>
-                <multiplicity>Many</multiplicity>
-                <relationship-role-source>
-                    <ejb-name>HoldingEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>quote</cmr-field-name>
-                </cmr-field>
-            </ejb-relationship-role>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>QuoteEJB</ejb-relationship-role-name>
-                <multiplicity>One</multiplicity>
-                <relationship-role-source>
-                    <ejb-name>QuoteEJB</ejb-name>
-                </relationship-role-source>
-            </ejb-relationship-role>
-        </ejb-relation>
-
-        <ejb-relation>
-            <ejb-relation-name>Quote-Orders</ejb-relation-name>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>Order-Has-Quote</ejb-relationship-role-name>
-                <multiplicity>Many</multiplicity>
-                <cascade-delete/>
-                <relationship-role-source>
-                    <ejb-name>OrderEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>quote</cmr-field-name>
-                </cmr-field>
-            </ejb-relationship-role>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>QuoteEJB</ejb-relationship-role-name>
-                <multiplicity>One</multiplicity>
-                <relationship-role-source>
-                    <ejb-name>QuoteEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>orders</cmr-field-name>
-                    <cmr-field-type>java.util.Collection</cmr-field-type>
-                </cmr-field>
-            </ejb-relationship-role>
-        </ejb-relation>
-
-
-
-        <ejb-relation>
-            <ejb-relation-name>Order-Holding</ejb-relation-name>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>Order-Has-Holding</ejb-relationship-role-name>
-                <multiplicity>One</multiplicity>
-                <relationship-role-source>
-                    <ejb-name>OrderEJB</ejb-name>
-                </relationship-role-source>
-                <cmr-field>
-                    <cmr-field-name>holding</cmr-field-name>
-                </cmr-field>
-            </ejb-relationship-role>
-            <ejb-relationship-role>
-                <ejb-relationship-role-name>HoldingEJB</ejb-relationship-role-name>
-                <multiplicity>One</multiplicity>
-                <cascade-delete/>
-                <relationship-role-source>
-                    <ejb-name>HoldingEJB</ejb-name>
-                </relationship-role-source>
-            </ejb-relationship-role>
-        </ejb-relation>
-    </relationships>
-
 
     <!-- 
-     **
-     **  A s s e m b l y   D e s c r i p t o r
-     **
-     -->
-    <assembly-descriptor>
-        <method-permission>
-            <description>UncheckedPermission:+:Unchecked method permission</description>
-            <unchecked/>
-            <method>
-                <ejb-name>AccountEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>AccountProfileEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>HoldingEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>KeyGenEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>KeySequenceEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>OrderEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>QuoteEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>TradeEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>TradeJDBC</ejb-name>
-                <method-name>*</method-name>
-            </method>
-        </method-permission>
-
-
-        <!--
-         ** 
-         ** C o n t a i n e r   T r a n s a c t i o n s
-         **
-         **  This section contains the transactional context for various methods of the 
-         **  EJBs deployed in this application.  They are described based on their type 
-         **  which are (in order) 
-         **
-         **    RequiresNew
-         **    NotSupported
-         **    Required
-         **
-         -->
-         
-         <!--
-          **
-          **  Requires New
-          ** 
-          -->
-        <container-transaction>
-            <method>
-                <ejb-name>TradeEJB</ejb-name>
-                <method-intf>Remote</method-intf>
-                <method-name>publishQuotePriceChange</method-name>
-                <method-params>
-                    <method-param>org.apache.geronimo.samples.daytrader.QuoteDataBean</method-param>
-                    <method-param>java.math.BigDecimal</method-param>
-                    <method-param>java.math.BigDecimal</method-param>
-                    <method-param>double</method-param>
-                </method-params>
-            </method>
-        	<method>
-        		<ejb-name>TradeJDBC</ejb-name>
-        		<method-intf>Remote</method-intf>
-        		<method-name>publishQuotePriceChange</method-name>
-        		<method-params>
-        			<method-param>org.apache.geronimo.samples.daytrader.QuoteDataBean</method-param>
-        			<method-param>java.math.BigDecimal</method-param>
-        			<method-param>java.math.BigDecimal</method-param>
-        			<method-param>double</method-param>
-        		</method-params>
-        	</method>
-            <trans-attribute>RequiresNew</trans-attribute>
-        </container-transaction>
-         
-         <!--
-          **
-          **  Not Supported
-          ** 
-          -->
-        <container-transaction>
-            <method>
-                <ejb-name>TradeEJB</ejb-name>
-                <method-intf>Remote</method-intf>
-                <method-name>resetTrade</method-name>
-                <method-params>
-                    <method-param>boolean</method-param>
-                </method-params>
-            </method>
-        	<method>
-        		<ejb-name>TradeJDBC</ejb-name>
-        		<method-intf>Remote</method-intf>
-        		<method-name>resetTrade</method-name>
-        		<method-params>
-        			<method-param>boolean</method-param>
-        		</method-params>
-        	</method>
-            <trans-attribute>NotSupported</trans-attribute>
-        </container-transaction>
-         
-         <!--
-          **
-          **  Required
-          ** 
-          -->
-        <container-transaction>
-            <method>
-                <ejb-name>AccountEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>AccountProfileEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>HoldingEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>KeyGenEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>KeySequenceEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>OrderEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>QuoteEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>TradeBrokerMDB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>TradeEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>TradeStreamerMDB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-        		<ejb-name>TradeJDBC</ejb-name>
-        		<method-name>*</method-name>
-        	</method>
-            <trans-attribute>Required</trans-attribute>
-        </container-transaction>
-
-        <!-- 
-         **
-         **  M e s s a g e   D e s t i n a t i o n s
-         **
-         -->
-        <message-destination>
-            <message-destination-name>TradeBrokerQueue</message-destination-name>
-        </message-destination>
-
-        <message-destination>
-            <message-destination-name>TradeStreamerTopic</message-destination-name>
-        </message-destination>
-
-    </assembly-descriptor>
+        All EJB 3.0 properties and attributes have been applied to the various DayTrader 
+        entity, session and message driven beans using annotations. The inline annotations 
+        can be overriden by modifing this file. 
+    -->    
 </ejb-jar>

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml Fri Aug 24 12:49:14 2007
@@ -18,13 +18,22 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
 
     <persistence-unit transaction-type="JTA" name="daytrader">
-
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+        <jta-data-source>jdbc/TradeDataSource</jta-data-source>  
+        <non-jta-data-source>jdbc/NoTxTradeDataSource</non-jta-data-source> 
+        
         <class>org.apache.geronimo.samples.daytrader.AccountDataBean</class>
         <class>org.apache.geronimo.samples.daytrader.AccountProfileDataBean</class>
         <class>org.apache.geronimo.samples.daytrader.HoldingDataBean</class>
         <class>org.apache.geronimo.samples.daytrader.OrderDataBean</class>
         <class>org.apache.geronimo.samples.daytrader.QuoteDataBean</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        
+        <properties>
+            <property name="openjpa.jdbc.DBDictionary" value="derby" /> 
+            <property name="openjpa.BrokerImpl" value="non-finalizing" />
+            <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+            <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+        </properties>
     </persistence-unit>
 </persistence>

Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/pom.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Fri Aug 24 12:49:14 2007
@@ -48,17 +48,24 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClient.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClient.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClient.java (original)
+++ geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClient.java Fri Aug 24 12:49:14 2007
@@ -23,10 +23,10 @@
 
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
+import javax.ejb.EJB;
 
 import org.apache.geronimo.samples.daytrader.QuoteDataBean;
-import org.apache.geronimo.samples.daytrader.ejb.Trade;
-import org.apache.geronimo.samples.daytrader.ejb.TradeHome;
+import org.apache.geronimo.samples.daytrader.ejb3.TradeSLSBRemote;
 
 public class TradeClient {
 
@@ -41,8 +41,10 @@
 
 	// EJB values
 	private InitialContext initial;
-	private Trade trade;
-	private boolean useENC = true;
+    private boolean waitForMain = false;
+    
+    @EJB
+    private static TradeSLSBRemote tradeSLSBRemote;
 
 	// Updater thread
     private final Timer timer = new Timer();
@@ -52,16 +54,14 @@
 	public static void main(String[] args) {
 		try	{
 			TradeClient streamer  = new TradeClient();
-			if (args.length > 0) {
-				if (args[0].equals("-noENC")) {
-					streamer.useENC = false;
-				}
-				else {
-					System.out.println("Usage TradeClient [-noENC]");
-					System.exit(1);
-				}
-			}
-
+            if (args.length > 0) {
+                if (args[0].equals("-waitForMain")) {
+                    streamer.waitForMain = true;
+                } else {
+                    System.out.println("Usage TradeClient [-waitForMain]");
+                    System.exit(1);
+                }
+            }
 			tradeClient = streamer;
 			streamer.startClient();
         }
@@ -75,14 +75,25 @@
 		return tradeClient;
 	}
 
-	private void startClient() throws Exception {
+	private void startClient() throws Exception { 
 		auditStats = new TradeQuoteAuditStats();
 		setupEJB();
-		TradeClientMessageListener listener = new TradeClientMessageListener(this, useENC);
+        TradeClientMessageListener listener = new TradeClientMessageListener(this);
 		listener.subscribe();
 		resetStatsFromServer();
 		gui = new TradeClientGUI(this);
 		gui.show();
+        
+        // Added the "waitForMain" flag to disable/enable the workaround below        
+        if (this.waitForMain) {
+            // Geronimo client terminates JVM process when Main completes (not sure why)
+            // even though client GUI is still active. For now, force Main to remain alive
+            // until GUI is closed.
+            
+            while (gui.isVisible())
+                Thread.sleep(5000);
+        }
+        
     }
 
 	public TradeQuoteAuditStats getAuditStats() {
@@ -95,7 +106,7 @@
 
 	public void resetStatsFromServer() throws Exception {
 		auditStats.clearStats();
-		Collection quotes = trade.getAllQuotes();
+		Collection<QuoteDataBean> quotes = tradeSLSBRemote.getAllQuotes();
 
 		for (Iterator it = quotes.iterator(); it.hasNext(); ) {
 			QuoteDataBean bean = (QuoteDataBean)it.next();
@@ -113,15 +124,6 @@
 
 	public void setupEJB() throws Exception {
 		initial = new InitialContext();
-		Object objref;
-		if (useENC) {
-			objref = initial.lookup("java:comp/env/ejb/Trade");
-		}
-		else {
-			objref = initial.lookup("ejb/TradeEJB");
-		}
-		TradeHome home = (TradeHome)PortableRemoteObject.narrow(objref, TradeHome.class);
-		trade = home.create();
 	}
 
 	public int getUpdateInterval() {

Modified: geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClientMessageListener.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClientMessageListener.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClientMessageListener.java (original)
+++ geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClientMessageListener.java Fri Aug 24 12:49:14 2007
@@ -19,6 +19,7 @@
 
 import javax.naming.InitialContext;
 import javax.jms.*;
+import javax.annotation.Resource;
 
 import org.apache.geronimo.samples.daytrader.util.*;
 
@@ -26,11 +27,12 @@
 
 public class TradeClientMessageListener implements MessageListener {
 	private TradeClient client;
-	private boolean useENC;
+    
+    private TopicConnectionFactory connFactory;
+    private Topic streamerTopic;
 
-	public TradeClientMessageListener(TradeClient client, boolean useENC) {
-		this.client = client;
-		this.useENC = useENC;
+    public TradeClientMessageListener(TradeClient client) {
+        this.client = client;
 	}
 
 	public void subscribe() {
@@ -40,20 +42,10 @@
 			
 			Log.trace("TradeStreamer pub/sub JNDI starting");
 			ConnectionFactory connFactory;
-			if (useENC) {
-				connFactory = (ConnectionFactory) context.lookup("java:comp/env/jms/TopicConnectionFactory");
-			}
-			else {
-				connFactory = (ConnectionFactory) context.lookup("jms/TopicConnectionFactory");
-			}
+			connFactory = (ConnectionFactory) context.lookup("java:comp/env/jms/TopicConnectionFactory");
 
 			Topic streamerTopic;
-			if (useENC) {
-				streamerTopic = (Topic) context.lookup("java:comp/env/jms/TradeStreamerTopic");
-			}
-			else {
-				streamerTopic = (Topic) context.lookup("jms/TradeStreamerTopic");
-			}
+			streamerTopic = (Topic) context.lookup("java:comp/env/jms/DTStreamerTopic3");
 
 			Log.trace("TradeStreamer pub/sub JNDI ending");
 
@@ -70,9 +62,9 @@
 			
 			consumer = sess.createConsumer(streamerTopic);
 			Log.trace("TradeStreamer pub/sub listener registered successfully");
-		}
-		catch (Exception e)	{
+        } catch (Exception e)	{
 			Log.error("TradeStreamer Subscribe Exception: " + e);
+            e.printStackTrace();
 		}
 	}
 

Modified: geronimo/daytrader/trunk/modules/streamer/src/main/resources/META-INF/application-client.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/src/main/resources/META-INF/application-client.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/src/main/resources/META-INF/application-client.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/src/main/resources/META-INF/application-client.xml Fri Aug 24 12:49:14 2007
@@ -21,13 +21,6 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
 
 	<display-name>TradeStreamerAppClient</display-name>
-	<ejb-ref>
-		<ejb-ref-name>ejb/Trade</ejb-ref-name>
-		<ejb-ref-type>Session</ejb-ref-type>
-		<home>org.apache.geronimo.samples.daytrader.ejb.TradeHome</home>
-		<remote>org.apache.geronimo.samples.daytrader.ejb.Trade</remote>
-		<ejb-link>TradeEJB</ejb-link>
-	</ejb-ref>
 	<resource-ref>
 		<res-ref-name>jms/TopicConnectionFactory</res-ref-name>
 		<res-type>javax.jms.TopicConnectionFactory</res-type>
@@ -35,15 +28,9 @@
 		<res-sharing-scope>Shareable</res-sharing-scope>
 	</resource-ref>
 	<message-destination-ref>
-		<message-destination-ref-name>
-			jms/TradeStreamerTopic
-		</message-destination-ref-name>
-		<message-destination-type>
-			javax.jms.Topic
-		</message-destination-type>
-		<message-destination-usage>Produces</message-destination-usage>
-		<message-destination-link>
-			TradeStreamerTopic
-		</message-destination-link>
-	</message-destination-ref>
+        <message-destination-ref-name>jms/DTStreamerTopic3</message-destination-ref-name>
+        <message-destination-type>javax.jms.Topic</message-destination-type>
+        <message-destination-usage>Produces</message-destination-usage>
+        <message-destination-link>jms/DTStreamerTopic3</message-destination-link>
+    </message-destination-ref>
 </application-client>

Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Fri Aug 24 12:49:14 2007
@@ -45,30 +45,8 @@
             <type>ejb</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.daytrader</groupId>
-            <artifactId>daytrader-wsappclient</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.daytrader</groupId>
-            <artifactId>daytrader-streamer</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBQueue.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBQueue.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBQueue.java (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBQueue.java Fri Aug 24 12:49:14 2007
@@ -54,7 +54,7 @@
     @Resource(name = "jms/QueueConnectionFactory")
     private ConnectionFactory queueConnectionFactory;
 
-    @Resource(name = "DTBrokerQueue3")
+    @Resource(name = "jms/DTBrokerQueue3")
     private Queue tradeBrokerQueue;
 
     public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {

Modified: geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBTopic.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBTopic.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBTopic.java (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2MDBTopic.java Fri Aug 24 12:49:14 2007
@@ -54,7 +54,7 @@
     @Resource(name = "jms/TopicConnectionFactory")
     private ConnectionFactory topicConnectionFactory;
 
-    @Resource(name = "DTStreamerTopic3")
+    @Resource(name = "jms/DTStreamerTopic3")
     private Topic tradeStreamerTopic;
 
     public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {

Modified: geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2TwoPhase.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2TwoPhase.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2TwoPhase.java (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2TwoPhase.java Fri Aug 24 12:49:14 2007
@@ -77,7 +77,7 @@
             }
 
             output.append("<HR>initTime: " + initTime).append("<BR>Hit Count: " + hitCount++);
-            output.append("<HR>Two phase ping selected a quote and sent a message to TradeBrokerQueue JMS queue<BR>Quote Information<BR><BR>" + quoteData.toHTML());
+            output.append("<HR>Two phase ping selected a quote and sent a message to DTBrokerQueue3 JMS queue<BR>Quote Information<BR><BR>" + quoteData.toHTML());
             out.println(output.toString());
 
         } catch (Exception e) {



Mime
View raw message