You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/03/12 16:51:40 UTC

svn commit: r752908 - in /geronimo/daytrader/trunk/modules: ear/src/main/resources/META-INF/ ejb/src/main/resources/META-INF/ web/src/main/webapp/WEB-INF/

Author: dwoods
Date: Thu Mar 12 15:51:39 2009
New Revision: 752908

URL: http://svn.apache.org/viewvc?rev=752908&view=rev
Log:
DAYTRADER-65 Enable daytrader works with JBoss 5.  Applied additional patches from Forrest Xia.

Added:
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml   (with props)
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml.old
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml.old
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml   (with props)
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml.old
Modified:
    geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/persistence.xml.jboss5

Modified: geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/persistence.xml.jboss5
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/persistence.xml.jboss5?rev=752908&r1=752907&r2=752908&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/persistence.xml.jboss5 (original)
+++ geronimo/daytrader/trunk/modules/ear/src/main/resources/META-INF/persistence.xml.jboss5 Thu Mar 12 15:51:39 2009
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
-   version="1.0">
-
-
-    <persistence-unit transaction-type="JTA" name="daytrader">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <!-- If using DB2, comment out this line -->
-        <!--<jta-data-source>jdbc/TradeDataSource</jta-data-source>  -->
-        <!-- If using mySQL or Oracle, comment out this line -->
-        <jta-data-source>java:jdbc/TradeDataSource</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>
-            <!-- According to your database type, you can set dialect properly -->            
-            <!--<property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect"/>-->
-            <!--<property name="hibernate.dialect" value="org.hibernate.dialect.OracleDialect"/>-->
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
-            <!-- This Hibernate property will update database schema according to EJB3 annotation definitions
-            Possible value: validate, update, create, create-drop -->
-            <!--<property name="hibernate.hbm2ddl.auto" value="update"/>-->
-        </properties>
-    </persistence-unit>
-</persistence>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+   version="1.0">
+
+
+    <persistence-unit transaction-type="JTA" name="daytrader">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <!-- If using DB2, comment out this line -->
+        <!--<jta-data-source>jdbc/TradeDataSource</jta-data-source>  -->
+        <!-- If using mySQL or Oracle, comment out this line -->
+        <jta-data-source>java:jdbc/TradeDataSource</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>
+            <!-- According to your database type, you can set dialect properly -->            
+            <!--<property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect"/>-->
+            <!--<property name="hibernate.dialect" value="org.hibernate.dialect.OracleDialect"/>-->
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
+            <!-- This Hibernate property will update database schema according to EJB3 annotation definitions
+            Possible value: validate, update, create, create-drop -->
+            <!--<property name="hibernate.hbm2ddl.auto" value="update"/>-->
+        </properties>
+    </persistence-unit>
+</persistence>

Added: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml?rev=752908&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml (added)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml Thu Mar 12 15:51:39 2009
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<jboss>
+   <enterprise-beans>
+      <session>
+         <ejb-name>TradeSLSBBean</ejb-name>
+         <jndi-name>ejb/Trade</jndi-name>
+            
+            <resource-ref>
+               <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
+               <jndi-name>ConnectionFactory</jndi-name>
+            </resource-ref>
+            
+            <resource-ref>
+               <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
+               <jndi-name>ConnectionFactory</jndi-name>
+            </resource-ref>
+            
+             <resource-ref>
+               <res-ref-name>jdbc/TradeDataSource</res-ref-name>
+               <!-- If using DB2, comment out this line -->
+               <!--<jndi-name>jdbc/TradeDataSource</jndi-name>-->
+               <!-- If using MySql or Oracle, use this line -->
+               <jndi-name>java:jdbc/TradeDataSource</jndi-name>
+             </resource-ref>
+
+            <message-destination-ref>
+                <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+                <jndi-name>TradeBrokerQueue</jndi-name>
+            </message-destination-ref>
+            <message-destination-ref>
+                <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+                <jndi-name>TradeStreamerTopic</jndi-name>
+            </message-destination-ref>
+                
+      </session>       
+  
+      <message-driven>
+         <ejb-name>DTStreamer3MDB</ejb-name> 
+         <destination-jndi-name>TradeStreamerTopic</destination-jndi-name>  
+      </message-driven>
+      
+      <message-driven>
+         <ejb-name>DTBroker3MDB</ejb-name>   
+         <destination-jndi-name>TradeBrokerQueue</destination-jndi-name> 
+         <ejb-ref>
+         <ejb-ref-name>ejb/Trade</ejb-ref-name>
+         <jndi-name>ejb/Trade</jndi-name>
+         </ejb-ref>                      
+      </message-driven> 
+
+   </enterprise-beans>
+  
+   <resource-managers>
+          <resource-manager>
+               <res-name>jms/QueueConnectionFactory</res-name>
+               <res-jndi-name>ConnectionFactory</res-jndi-name>
+            </resource-manager>
+            
+            <resource-manager>
+               <res-name>jms/TopicConnectionFactory</res-name>
+               <res-jndi-name>ConnectionFactory</res-jndi-name>
+            </resource-manager>
+            
+            <resource-manager>
+               <res-name>jms/TradeStreamerTopic</res-name>
+               <res-jndi-name>TradeStreamerTopic</res-jndi-name>
+            </resource-manager>
+            
+            <resource-manager>
+               <res-name>jms/TradeBrokerQueue</res-name>
+               <res-jndi-name>TradeBrokerQueue</res-jndi-name>
+            </resource-manager>
+            
+             <resource-manager>
+               <res-name>jdbc/TradeDataSource</res-name>
+               <!-- If using DB2, comment out this line -->
+               <!--<res-jndi-name>jdbc/TradeDataSource</res-jndi-name>-->
+               <!-- If using MySql or Oracle, use this line -->
+               <res-jndi-name>java:jdbc/TradeDataSource</res-jndi-name>
+            </resource-manager>
+   </resource-managers> 
+</jboss>

Propchange: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml.old
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml.old?rev=752908&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml.old (added)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml.old Thu Mar 12 15:51:39 2009
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+     <entity>
+     <ejb-name>QuoteEJB</ejb-name>
+     <jndi-name>Quote</jndi-name>
+     </entity>
+     
+     <entity>
+     <ejb-name>AccountEJB</ejb-name>
+     <jndi-name>Account</jndi-name>
+     </entity>
+     
+     <entity>
+     <ejb-name>HoldingEJB</ejb-name>
+     <jndi-name>Holding</jndi-name>
+     </entity>
+     
+     <entity>
+     <ejb-name>OrderEJB</ejb-name>
+     <jndi-name>Order</jndi-name>
+     </entity>
+     
+     <entity>
+     <ejb-name>AccountProfileEJB</ejb-name>
+     <jndi-name>AccountProfile</jndi-name>
+     </entity>
+     
+      <entity>
+     <ejb-name>KeyGenEJB</ejb-name>
+     <jndi-name>KeyGen</jndi-name>
+     </entity>
+           
+        
+
+      
+     <session>
+         <ejb-name>TradeEJB</ejb-name>
+         <jndi-name>ejb/Trade</jndi-name>
+          
+           <ejb-ref>
+               <ejb-ref-name>ejb/Trade</ejb-ref-name>
+               <jndi-name>Trade</jndi-name>
+            </ejb-ref>
+            
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/Quote</ejb-ref-name>
+               <local-jndi-name>Quote</local-jndi-name>
+            </ejb-local-ref>
+            
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/Account</ejb-ref-name>
+               <local-jndi-name>Account</local-jndi-name>
+            </ejb-local-ref>
+            
+            
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/Holding</ejb-ref-name>
+               <local-jndi-name>Holding</local-jndi-name>
+            </ejb-local-ref>
+            
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/Order</ejb-ref-name>
+               <local-jndi-name>Order</local-jndi-name>
+            </ejb-local-ref>
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/KeySequence</ejb-ref-name>
+               <local-jndi-name>KeySequence</local-jndi-name>
+            </ejb-local-ref>
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/AccountProfile</ejb-ref-name>
+               <local-jndi-name>AccountProfile</local-jndi-name>
+             </ejb-local-ref>
+            
+               
+            <resource-ref>
+               <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
+               <jndi-name>ConnectionFactory</jndi-name>
+            </resource-ref>
+            
+            <resource-ref>
+               <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
+               <jndi-name>ConnectionFactory</jndi-name>
+            </resource-ref>
+            
+             <resource-ref>
+               <res-ref-name>jdbc/TradeDataSource</res-ref-name>
+               <jndi-name>jdbc/TradeDataSource</jndi-name>
+            </resource-ref>
+
+
+            <message-destination-ref>
+                <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+                <jndi-name>TradeBrokerQueue</jndi-name>
+            </message-destination-ref>
+            <message-destination-ref>
+                <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+                <jndi-name>TradeStreamerTopic</jndi-name>
+            </message-destination-ref>
+                
+      </session>
+   
+   
+        <session>
+         <ejb-name>KeySequenceEJB</ejb-name>
+         <jndi-name>KeySequence</jndi-name>
+
+      </session>   
+  
+      <message-driven>
+         <ejb-name>TradeStreamerMDB</ejb-name> 
+         <destination-jndi-name>TradeStreamerTopic</destination-jndi-name>  
+      </message-driven>
+      
+      <message-driven>
+         <ejb-name>TradeBrokerMDB</ejb-name>   
+         <destination-jndi-name>TradeBrokerQueue</destination-jndi-name> 
+         <ejb-ref>
+         <ejb-ref-name>ejb/Trade</ejb-ref-name>
+         <jndi-name>Trade</jndi-name>
+         </ejb-ref>                      
+      </message-driven>
+  
+  
+
+   </enterprise-beans>
+  
+   <resource-managers>
+          <resource-manager>
+               <res-name>jms/QueueConnectionFactory</res-name>
+               <res-jndi-name>ConnectionFactory</res-jndi-name>
+            </resource-manager>
+            
+            <resource-manager>
+               <res-name>jms/TopicConnectionFactory</res-name>
+               <res-jndi-name>ConnectionFactory</res-jndi-name>
+            </resource-manager>
+            
+            <resource-manager>
+               <res-name>jms/TradeStreamerTopic</res-name>
+               <res-jndi-name>TradeStreamerTopic</res-jndi-name>
+            </resource-manager>
+            
+            <resource-manager>
+               <res-name>jms/TradeBrokerQueue</res-name>
+               <res-jndi-name>TradeBrokerQueue</res-jndi-name>
+            </resource-manager>
+            
+             <resource-manager>
+               <res-name>jdbc/TradeDataSource</res-name>
+               <res-jndi-name>jdbc/TradeDataSource</res-jndi-name>
+            </resource-manager>
+
+   </resource-managers> 
+
+  <!--
+    | for container settings, you can merge in jboss-container.xml
+    | this can contain <invoker-proxy-bindings/> and <container-configurations/>
+  -->
+
+</jboss>

Added: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml.old
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml.old?rev=752908&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml.old (added)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml.old Thu Mar 12 15:51:39 2009
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<jbosscmp-jdbc>
+   <defaults>
+   <datasource>jdbc/TradeDataSource</datasource>
+   <datasource-mapping>${jboss.mapping}</datasource-mapping>
+   </defaults>
+
+   <enterprise-beans>
+   <entity>
+   <ejb-name>QuoteEJB</ejb-name>
+   <table-name>QuoteEJB</table-name>
+    <cmp-field>
+               <field-name>open</field-name>
+               <column-name>open1</column-name>
+                <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+                <cmp-field>
+               <field-name>change</field-name>
+               <column-name>change1</column-name>
+               <jdbc-type>DOUBLE</jdbc-type>
+               <sql-type>DOUBLE</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>low</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>price</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>high</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>volume</field-name>
+               <jdbc-type>DOUBLE</jdbc-type>
+               <sql-type>DOUBLE</sql-type>
+            </cmp-field>
+             <cmp-field>
+            <field-name>companyName</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+             <cmp-field>
+            <field-name>symbol</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+   </entity>
+   <entity>
+   <ejb-name>OrderEJB</ejb-name>
+   <cmp-field>
+               <field-name>price</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(10,2)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>orderFee</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+             <field-name>completionDate</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+            <cmp-field>
+            <field-name>orderType</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+             <cmp-field>
+            <field-name>orderStatus</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>quantity</field-name>
+               <jdbc-type>DOUBLE</jdbc-type>
+               <sql-type>DOUBLE</sql-type>
+            </cmp-field>
+              <cmp-field>
+             <field-name>openDate</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>orderID</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+            <!-- cmp-field>
+               <field-name>account_accountid</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER(4)</sql-type>
+            </cmp-field>
+              <cmp-field>
+            <field-name>quote_symbol</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>holding_holdingid</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER(4)</sql-type>
+            </cmp-field>   -->
+   </entity>
+   <entity>
+   <ejb-name>AccountEJB</ejb-name>
+               <cmp-field>
+               <field-name>logoutCount</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+              <cmp-field>
+               <field-name>loginCount</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+              <cmp-field>
+               <field-name>accountID</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+                <cmp-field>
+             <field-name>balance</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC</sql-type>
+            </cmp-field>
+                <cmp-field>
+             <field-name>openBalance</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC</sql-type>
+            </cmp-field>
+            <cmp-field>
+             <field-name>creationDate</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+                <cmp-field>
+            <field-name>lastLogin</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+              <!-- cmp-field>
+            <field-name>profile_userid</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>    -->
+   </entity>
+   <entity>
+   <ejb-name>AccountProfileEJB</ejb-name>
+       <cmp-field>
+               <field-name>address</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>passwd</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>userID</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>email</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>creditCard</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>fullName</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+   </entity>
+  <entity>
+   <ejb-name>HoldingEJB</ejb-name>
+              <cmp-field>
+               <field-name>purchasePrice</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>holdingID</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>quantity</field-name>
+               <jdbc-type>DOUBLE</jdbc-type>
+               <sql-type>DOUBLE</sql-type>
+            </cmp-field>
+             <cmp-field>
+             <field-name>purchaseDate</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+             <!--  Xcmp-field>
+               <field-name>account_accountID</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+              <cmp-field>
+            <field-name>quote-symbol</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>   -->
+   </entity>
+   <entity>
+   <ejb-name>KeyGenEJB</ejb-name>
+    <!-- cmp-field>
+               <field-name>keyval</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+              <cmp-field>
+            <field-name>keyname</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field> -->
+   </entity>
+  
+
+   </enterprise-beans>
+   <relationships>
+    <ejb-relation>
+            <ejb-relation-name>Account-Orders</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>accountID</field-name>
+            <column-name>ACCOUNT_ACCOUNTID</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>Order-Has-Account</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+    
+    <ejb-relation>
+            <ejb-relation-name>Account-AccountProfile</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>Account-Has-AccountProfile</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>AccountProfileEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>userID</field-name>
+            <column-name>PROFILE_USERID</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+    
+    <ejb-relation>
+            <ejb-relation-name>Account-Holdings</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>accountID</field-name>
+            <column-name>ACCOUNT_ACCOUNTID</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>Holding-Has-Account</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+            
+    </ejb-relation>
+    
+        <ejb-relation>
+            <ejb-relation-name>Quote-Holdings</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>Holding-Has-Quote</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>QuoteEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>symbol</field-name>
+            <column-name>QUOTE_SYMBOL</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+    
+        <ejb-relation>
+            <ejb-relation-name>Quote-Orders</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>Order-Has-Quote</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>QuoteEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>symbol</field-name>
+            <column-name>QUOTE_SYMBOL</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+    
+        <ejb-relation>
+            <ejb-relation-name>Order-Holding</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>Order-Has-Holding</ejb-relationship-role-name>
+            <key-fields/>
+            <!--  key-field><field-name>orderID</field-name><column-name>ORDERID2</column-name></key-field></key-fields>
+             -->
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>HoldingEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>holdingID</field-name>
+            <column-name>HOLDING_HOLDINGID</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+
+ 
+   </relationships>
+
+</jbosscmp-jdbc>

Added: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml?rev=752908&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml (added)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml Thu Mar 12 15:51:39 2009
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
+<jboss-web>
+
+      <resource-ref>
+         <res-ref-name>jdbc/TradeDataSource</res-ref-name>
+         <!-- If using DB2, comment out this line -->
+         <!--<jndi-name>jdbc/TradeDataSource</jndi-name>-->
+         <!-- If using MySql or Oracle, use this line -->
+         <jndi-name>java:jdbc/TradeDataSource</jndi-name>
+      </resource-ref>
+      
+      <resource-ref>
+         <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
+         <jndi-name>ConnectionFactory</jndi-name>
+      </resource-ref>
+
+      <resource-ref>
+         <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
+         <jndi-name>ConnectionFactory</jndi-name>
+      </resource-ref>
+        
+      <message-destination-ref>
+         <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+         <jndi-name>TradeBrokerQueue</jndi-name>
+      </message-destination-ref>
+
+      <message-destination-ref>
+         <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+         <jndi-name>TradeStreamerTopic</jndi-name>
+      </message-destination-ref>
+
+</jboss-web>

Propchange: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml.old
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml.old?rev=752908&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml.old (added)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml.old Thu Mar 12 15:51:39 2009
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.3//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+
+      <resource-ref>
+         <res-ref-name>jdbc/TradeDataSource</res-ref-name>
+        <jndi-name>jdbc/TradeDataSource</jndi-name>
+      </resource-ref>
+      
+      <resource-ref>
+         <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
+         <jndi-name>ConnectionFactory</jndi-name>
+      </resource-ref>
+
+      <resource-ref>
+         <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
+         <jndi-name>ConnectionFactory</jndi-name>
+      </resource-ref>
+
+      <ejb-ref>
+         <ejb-ref-name>ejb/Trade</ejb-ref-name>
+         <jndi-name>Trade</jndi-name>
+      </ejb-ref>
+      
+      <ejb-ref>
+         <ejb-ref-name>ejb/Quote</ejb-ref-name>
+         <jndi-name>Quote</jndi-name> 
+      </ejb-ref>
+
+        
+      <message-destination-ref>
+         <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+         <jndi-name>TradeBrokerQueue</jndi-name>
+      </message-destination-ref>
+
+      <message-destination-ref>
+         <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+         <jndi-name>TradeStreamerTopic</jndi-name>
+      </message-destination-ref>
+</jboss-web>