geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cjbly...@apache.org
Subject svn commit: r569494 [3/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
Modified: geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml Fri Aug 24 12:49:14 2007
@@ -54,6 +54,11 @@
         </dependencies>
     </environment>
 
+    <!--
+     **
+     **  DayTrader Web War Module Definition  
+     **
+    -->
     <module>
         <web>web.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
@@ -72,486 +77,46 @@
 
 
     <!--
-    ##
-    ##  T r a d e E J B . j a r
-    ##  Module Definition
-    ##
-    ##
+     **
+     **  DayTrader EJB Jar Module Definition  
+     **
     -->
     <module>
         <ejb>dt-ejb.jar</ejb>
-        <!--  Note this must match the -->
         <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
 
-
-            <!--
-            ##
-            ##  C o n n e c t i o n  F a c t o r y  D e f i n i t i o n
-            ##
-            ##
-            ##
-            -->
-            <cmp-connection-factory>
-                <resource-link>jdbc/TradeDataSource</resource-link>
-            </cmp-connection-factory>
-
             <enterprise-beans>
-                <session>
-                    <ejb-name>TradeEJB</ejb-name>
-                    <jndi-name>ejb/TradeEJB</jndi-name>
-                    <!-- resource-env-ref>
-                        <ref-name>jms/TradeBrokerQueue</ref-name>
-                        <message-destination-link>jms/TradeBrokerQueue</message-destination-link>
-                    </resource-env-ref -->
-                </session>
-                
-                <session>
-                    <ejb-name>KeySequenceEJB</ejb-name>
-                    <jndi-name>ejb/KeySequenceEJB</jndi-name>
-                    <cache-size>100</cache-size>
-                </session>
-
-
-                <!--
-                ##
-                ##  H o l d i n g E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>HoldingEJB</ejb-name>
-                    <table-name>HOLDINGEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>purchasePrice</cmp-field-name>
-                        <table-column>purchasePrice</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>holdingID</cmp-field-name>
-                        <table-column>holdingID</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>quantity</cmp-field-name>
-                        <table-column>quantity</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>purchaseDate</cmp-field-name>
-                        <table-column>purchaseDate</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  A c c o u n t P r o f i l e E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>AccountProfileEJB</ejb-name>
-                    <table-name>AccountProfileEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>address</cmp-field-name>
-                        <table-column>address</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>passwd</cmp-field-name>
-                        <table-column>passwd</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>userID</cmp-field-name>
-                        <table-column>userID</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>email</cmp-field-name>
-                        <table-column>email</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>creditCard</cmp-field-name>
-                        <table-column>creditCard</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>fullName</cmp-field-name>
-                        <table-column>fullName</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  Q u o t e E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>QuoteEJB</ejb-name>
-                    <table-name>QuoteEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>low</cmp-field-name>
-                        <table-column>low</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>open</cmp-field-name>
-                        <table-column>open1</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>volume</cmp-field-name>
-                        <table-column>volume</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>price</cmp-field-name>
-                        <table-column>price</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>high</cmp-field-name>
-                        <table-column>high</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>companyName</cmp-field-name>
-                        <table-column>companyName</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>symbol</cmp-field-name>
-                        <table-column>symbol</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>change</cmp-field-name>
-                        <table-column>change1</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  K e y G e n E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>KeyGenEJB</ejb-name>
-                    <table-name>KeyGenEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>keyVal</cmp-field-name>
-                        <table-column>keyVal</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>keyName</cmp-field-name>
-                        <table-column>keyName</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  A c c o u n t E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>AccountEJB</ejb-name>
-                    <table-name>AccountEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>creationDate</cmp-field-name>
-                        <table-column>creationDate</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>openBalance</cmp-field-name>
-                        <table-column>openBalance</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>logoutCount</cmp-field-name>
-                        <table-column>logoutCount</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>balance</cmp-field-name>
-                        <table-column>balance</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>accountID</cmp-field-name>
-                        <table-column>accountID</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>lastLogin</cmp-field-name>
-                        <table-column>lastLogin</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>loginCount</cmp-field-name>
-                        <table-column>loginCount</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  O r d e r E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>OrderEJB</ejb-name>
-                    <table-name>OrderEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>orderFee</cmp-field-name>
-                        <table-column>orderFee</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>completionDate</cmp-field-name>
-                        <table-column>completionDate</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>orderType</cmp-field-name>
-                        <table-column>orderType</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>orderStatus</cmp-field-name>
-                        <table-column>orderStatus</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>price</cmp-field-name>
-                        <table-column>price</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>quantity</cmp-field-name>
-                        <table-column>quantity</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>openDate</cmp-field-name>
-                        <table-column>openDate</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>orderID</cmp-field-name>
-                        <table-column>orderID</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
                 <message-driven>
-                    <ejb-name>TradeStreamerMDB</ejb-name>
+                    <ejb-name>DTBroker3MDB</ejb-name>
                     <resource-adapter>
                         <resource-link>TradeJMSResources</resource-link>
                     </resource-adapter>
-                    <activation-config>
-                        <activation-config-property>
-                            <activation-config-property-name>destinationType</activation-config-property-name>
-                            <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>destination</activation-config-property-name>
-                            <activation-config-property-value>jms/TradeStreamerTopic</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>acknowledgeMode</activation-config-property-name>
-                            <activation-config-property-value>Auto-acknowledge</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>SubscriptionDurability</activation-config-property-name>
-                            <activation-config-property-value>NonDurable</activation-config-property-value>
-                        </activation-config-property>
-                    </activation-config>
                 </message-driven>
 
                 <message-driven>
-                    <ejb-name>TradeBrokerMDB</ejb-name>
+                    <ejb-name>DTStreamer3MDB</ejb-name>
                     <resource-adapter>
-                        <!--<resource-link>TradeJMS</resource-link>-->
                         <resource-link>TradeJMSResources</resource-link>
                     </resource-adapter>
-                    <activation-config>
-                        <activation-config-property>
-                            <activation-config-property-name>destinationType</activation-config-property-name>
-                            <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>destination</activation-config-property-name>
-                            <activation-config-property-value>jms/TradeBrokerQueue</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>acknowledgeMode</activation-config-property-name>
-                            <activation-config-property-value>Auto-acknowledge</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>SubscriptionDurability</activation-config-property-name>
-                            <activation-config-property-value>NonDurable</activation-config-property-value>
-                        </activation-config-property>
-                    </activation-config>
                 </message-driven>
             </enterprise-beans>
 
             <!--
             **
-            ** R e l a t i o n s h i p s   D e f i n i t i o n s
-            **
-            **
-            ** The following section defines the relationshoips for the entity beans in the application.
-            -->
-            <relationships>
-                <ejb-relation>
-                    <ejb-relation-name>Account-Orders</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>AccountEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>orders</cmr-field-name>
-                        </cmr-field>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>accountID</key-column>
-                                <foreign-key-column>account_accountID</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
-                **
-                ** A c c o u n t   -   A c c o u n t P r o f i l e
-                **
-                **
-                ** The following section defines the relationships for the entity beans in the application.
-                -->
-                <ejb-relation>
-                    <ejb-relation-name>Account-AccountProfile</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>Account-Has-AccountProfile</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>AccountEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>profile</cmr-field-name>
-                        </cmr-field>
-                        <foreign-key-column-on-source/>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>userID</key-column>
-                                <foreign-key-column>profile_userID</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
+             ** The following section can be used to override the settings in the
+             ** persistence.xml file. For instance, if you choose to deploy DayTrader
+             ** against a DB2 database, the DBDictionary can be specified here.
                 **
-                ** A c c o u n t   -   H o l d i n g s
-                **
-                **
-                **
-                -->
-                <ejb-relation>
-                    <ejb-relation-name>Account-Holdings</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>AccountEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>holdings</cmr-field-name>
-                        </cmr-field>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>accountID</key-column>
-                                <foreign-key-column>account_accountID</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
-                **
-                ** Q u o t e  -  H o l d i n g s
-                **
-                **
-                ** The following section defines the relationships for the entity beans in the application.
                 -->
-                <ejb-relation>
-                    <ejb-relation-name>Quote-Holdings</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>Holding-Has-Quote</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>HoldingEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>quote</cmr-field-name>
-                        </cmr-field>
-                        <foreign-key-column-on-source/>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>symbol</key-column>
-                                <foreign-key-column>quote_symbol</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
-                **
-                ** Q u o t e   -   O r d e r s
-                **
-                **
-                ** The following section defines the relationships for the entity beans in the application.
-                -->
-                <ejb-relation>
-                    <ejb-relation-name>Quote-Orders</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>Order-Has-Quote</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>OrderEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>quote</cmr-field-name>
-                        </cmr-field>
-                        <foreign-key-column-on-source/>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>symbol</key-column>
-                                <foreign-key-column>quote_symbol</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
-                **
-                ** O r d e r  -   H o l d i n g
-                **
-                **
-                ** The following section defines the relationships for the entity beans in the application.
-                -->
-                <ejb-relation>
-                    <ejb-relation-name>Order-Holding</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>Order-Has-Holding</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>OrderEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>holding</cmr-field-name>
-                        </cmr-field>
-                        <foreign-key-column-on-source/>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>holdingID</key-column>
-                                <foreign-key-column>holding_holdingID</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-            </relationships>
-            <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
 
+            <!--<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
                 <persistence-unit 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>
                     <properties>
-                        <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
-                        <!-- property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DB2Dictionary"/ -->
-                        <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
-                        <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+                        <property name="openjpa.jdbc.DBDictionary" value="db2" />
+                        <property name="openjpa.jdbc.DBDictionary" value="derby" />
                     </properties>
                 </persistence-unit>
-            </persistence>
-
+            </persistence>-->
         </openejb-jar>
     </module>
 
@@ -619,8 +184,8 @@
                         <adminobject-interface>javax.jms.Topic</adminobject-interface>
                         <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
                         <adminobject-instance>
-                            <message-destination-name>TradeStreamerTopic</message-destination-name>
-                            <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
+                            <message-destination-name>DTStreamerTopic3</message-destination-name>
+                            <config-property-setting name="PhysicalName">DTStreamerTopic3</config-property-setting>
                         </adminobject-instance>
                     </adminobject>
 
@@ -761,8 +326,8 @@
                 <adminobject-interface>javax.jms.Topic</adminobject-interface>
                 <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
                 <adminobject-instance>
-                    <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
-                    <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
+                    <message-destination-name>DTStreamerTopic3</message-destination-name>
+                    <config-property-setting name="PhysicalName">DTStreamerTopic3</config-property-setting>
                 </adminobject-instance>
             </adminobject>
 
@@ -770,8 +335,8 @@
                 <adminobject-interface>javax.jms.Queue</adminobject-interface>
                 <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
                 <adminobject-instance>
-                    <message-destination-name>jms/TradeBrokerQueue</message-destination-name>
-                    <config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
+                    <message-destination-name>DTBrokerQueue3</message-destination-name>
+                    <config-property-setting name="PhysicalName">DTBrokerQueue3</config-property-setting>
                 </adminobject-instance>
             </adminobject>
 

Modified: geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml Fri Aug 24 12:49:14 2007
@@ -53,6 +53,11 @@
         </dependencies>
     </environment>
 
+    <!--
+     **
+     **  DayTrader Web War Module Definition  
+     **
+    -->
     <module>
         <web>web.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
@@ -71,313 +76,21 @@
 
 
     <!--
-    ##
-    ##  T r a d e E J B . j a r
-    ##  Module Definition
-    ##
-    ##
+     **
+     **  DayTrader EJB Jar Module Definition  
+     **
     -->
     <module>
         <ejb>dt-ejb.jar</ejb>
-        <!--  Note this must match the -->
         <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
 
-
-            <!--
-            ##
-            ##  C o n n e c t i o n  F a c t o r y  D e f i n i t i o n
-            ##
-            ##
-            ##
-            -->
-            <cmp-connection-factory>
-                <resource-link>jdbc/TradeDataSource</resource-link>
-            </cmp-connection-factory>
-
             <enterprise-beans>
-                <session>
-                    <ejb-name>TradeEJB</ejb-name>
-                    <jndi-name>ejb/TradeEJB</jndi-name>
-                </session>
-                
-                <session>
-                    <ejb-name>KeySequenceEJB</ejb-name>
-                    <jndi-name>ejb/KeySequenceEJB</jndi-name>
-                    <cache-size>100</cache-size>
-                </session>
-
-
-                <!--
-                ##
-                ##  H o l d i n g E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>HoldingEJB</ejb-name>
-                    <table-name>HOLDINGEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>purchasePrice</cmp-field-name>
-                        <table-column>purchasePrice</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>holdingID</cmp-field-name>
-                        <table-column>holdingID</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>quantity</cmp-field-name>
-                        <table-column>quantity</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>purchaseDate</cmp-field-name>
-                        <table-column>purchaseDate</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  A c c o u n t P r o f i l e E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>AccountProfileEJB</ejb-name>
-                    <table-name>AccountProfileEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>address</cmp-field-name>
-                        <table-column>address</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>passwd</cmp-field-name>
-                        <table-column>passwd</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>userID</cmp-field-name>
-                        <table-column>userID</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>email</cmp-field-name>
-                        <table-column>email</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>creditCard</cmp-field-name>
-                        <table-column>creditCard</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>fullName</cmp-field-name>
-                        <table-column>fullName</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  Q u o t e E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>QuoteEJB</ejb-name>
-                    <table-name>QuoteEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>low</cmp-field-name>
-                        <table-column>low</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>open</cmp-field-name>
-                        <table-column>open1</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>volume</cmp-field-name>
-                        <table-column>volume</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>price</cmp-field-name>
-                        <table-column>price</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>high</cmp-field-name>
-                        <table-column>high</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>companyName</cmp-field-name>
-                        <table-column>companyName</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>symbol</cmp-field-name>
-                        <table-column>symbol</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>change</cmp-field-name>
-                        <table-column>change1</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  K e y G e n E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>KeyGenEJB</ejb-name>
-                    <table-name>KeyGenEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>keyVal</cmp-field-name>
-                        <table-column>keyVal</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>keyName</cmp-field-name>
-                        <table-column>keyName</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  A c c o u n t E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>AccountEJB</ejb-name>
-                    <table-name>AccountEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>creationDate</cmp-field-name>
-                        <table-column>creationDate</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>openBalance</cmp-field-name>
-                        <table-column>openBalance</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>logoutCount</cmp-field-name>
-                        <table-column>logoutCount</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>balance</cmp-field-name>
-                        <table-column>balance</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>accountID</cmp-field-name>
-                        <table-column>accountID</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>lastLogin</cmp-field-name>
-                        <table-column>lastLogin</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>loginCount</cmp-field-name>
-                        <table-column>loginCount</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <!--
-                ##
-                ##  O r d e r E J B
-                ##
-                -->
-                <entity>
-                    <ejb-name>OrderEJB</ejb-name>
-                    <table-name>OrderEJB</table-name>
-                    <cmp-field-mapping>
-                        <cmp-field-name>orderFee</cmp-field-name>
-                        <table-column>orderFee</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>completionDate</cmp-field-name>
-                        <table-column>completionDate</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>orderType</cmp-field-name>
-                        <table-column>orderType</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>orderStatus</cmp-field-name>
-                        <table-column>orderStatus</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>price</cmp-field-name>
-                        <table-column>price</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>quantity</cmp-field-name>
-                        <table-column>quantity</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>openDate</cmp-field-name>
-                        <table-column>openDate</table-column>
-                    </cmp-field-mapping>
-                    <cmp-field-mapping>
-                        <cmp-field-name>orderID</cmp-field-name>
-                        <table-column>orderID</table-column>
-                    </cmp-field-mapping>
-                </entity>
-
-
-                <message-driven>
-                    <ejb-name>TradeStreamerMDB</ejb-name>
-                    <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
-                    </resource-adapter>
-                    <activation-config>
-                        <activation-config-property>
-                            <activation-config-property-name>destinationType</activation-config-property-name>
-                            <activation-config-property-value>javax.jms.Topic</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>destination</activation-config-property-name>
-                            <activation-config-property-value>TradeStreamerTopic</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>acknowledgeMode</activation-config-property-name>
-                            <activation-config-property-value>Auto-acknowledge</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>SubscriptionDurability</activation-config-property-name>
-                            <activation-config-property-value>NonDurable</activation-config-property-value>
-                        </activation-config-property>
-                    </activation-config>
-                </message-driven>
-
-                <message-driven>
-                    <ejb-name>TradeBrokerMDB</ejb-name>
-                    <resource-adapter>
-                        <!--<resource-link>TradeJMS</resource-link>-->
-                        <resource-link>TradeJMSResources</resource-link>
-                    </resource-adapter>
-                    <activation-config>
-                        <activation-config-property>
-                            <activation-config-property-name>destinationType</activation-config-property-name>
-                            <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>destination</activation-config-property-name>
-                            <activation-config-property-value>TradeBrokerQueue</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>acknowledgeMode</activation-config-property-name>
-                            <activation-config-property-value>Auto-acknowledge</activation-config-property-value>
-                        </activation-config-property>
-                        <activation-config-property>
-                            <activation-config-property-name>SubscriptionDurability</activation-config-property-name>
-                            <activation-config-property-value>NonDurable</activation-config-property-value>
-                        </activation-config-property>
-                    </activation-config>
-                </message-driven>
-                
-                <message-driven>
-                    <ejb-name>TestMDB</ejb-name>
-                    <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
-                    </resource-adapter>
-                </message-driven>
-                
                 <message-driven>
                     <ejb-name>DTBroker3MDB</ejb-name>
                     <resource-adapter>
                         <resource-link>TradeJMSResources</resource-link>
                     </resource-adapter>
-                </message-driven>
-                
+                </message-driven>                
                 <message-driven>
                     <ejb-name>DTStreamer3MDB</ejb-name>
                     <resource-adapter>
@@ -385,189 +98,23 @@
                     </resource-adapter>
                 </message-driven>
             </enterprise-beans>
-
-            <!--
-            **
-            ** R e l a t i o n s h i p s   D e f i n i t i o n s
-            **
-            **
-            ** The following section defines the relationshoips for the entity beans in the application.
+            
+            <!-- 
+             **
+             ** The following section can be used to override the settings in the
+             ** persistence.xml file. For instance, if you choose to deploy DayTrader
+             ** against a DB2 database, the DBDictionary can be specified here.
+             **
             -->
-            <relationships>
-                <ejb-relation>
-                    <ejb-relation-name>Account-Orders</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>AccountEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>orders</cmr-field-name>
-                        </cmr-field>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>accountID</key-column>
-                                <foreign-key-column>account_accountID</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
-                **
-                ** A c c o u n t   -   A c c o u n t P r o f i l e
-                **
-                **
-                ** The following section defines the relationships for the entity beans in the application.
-                -->
-                <ejb-relation>
-                    <ejb-relation-name>Account-AccountProfile</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>Account-Has-AccountProfile</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>AccountEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>profile</cmr-field-name>
-                        </cmr-field>
-                        <foreign-key-column-on-source/>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>userID</key-column>
-                                <foreign-key-column>profile_userID</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
-                **
-                ** A c c o u n t   -   H o l d i n g s
-                **
-                **
-                **
-                -->
-                <ejb-relation>
-                    <ejb-relation-name>Account-Holdings</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>AccountEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>holdings</cmr-field-name>
-                        </cmr-field>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>accountID</key-column>
-                                <foreign-key-column>account_accountID</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
-                **
-                ** Q u o t e  -  H o l d i n g s
-                **
-                **
-                ** The following section defines the relationships for the entity beans in the application.
-                -->
-                <ejb-relation>
-                    <ejb-relation-name>Quote-Holdings</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>Holding-Has-Quote</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>HoldingEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>quote</cmr-field-name>
-                        </cmr-field>
-                        <foreign-key-column-on-source/>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>symbol</key-column>
-                                <foreign-key-column>quote_symbol</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
-                **
-                ** Q u o t e   -   O r d e r s
-                **
-                **
-                ** The following section defines the relationships for the entity beans in the application.
-                -->
-                <ejb-relation>
-                    <ejb-relation-name>Quote-Orders</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>Order-Has-Quote</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>OrderEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>quote</cmr-field-name>
-                        </cmr-field>
-                        <foreign-key-column-on-source/>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>symbol</key-column>
-                                <foreign-key-column>quote_symbol</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-
-
-                <!--
-                **
-                ** O r d e r  -   H o l d i n g
-                **
-                **
-                ** The following section defines the relationships for the entity beans in the application.
-                -->
-                <ejb-relation>
-                    <ejb-relation-name>Order-Holding</ejb-relation-name>
-                    <ejb-relationship-role>
-                        <ejb-relationship-role-name>Order-Has-Holding</ejb-relationship-role-name>
-                        <relationship-role-source>
-                            <ejb-name>OrderEJB</ejb-name>
-                        </relationship-role-source>
-                        <cmr-field>
-                            <cmr-field-name>holding</cmr-field-name>
-                        </cmr-field>
-                        <foreign-key-column-on-source/>
-                        <role-mapping>
-                            <cmr-field-mapping>
-                                <key-column>holdingID</key-column>
-                                <foreign-key-column>holding_holdingID</foreign-key-column>
-                            </cmr-field-mapping>
-                        </role-mapping>
-                    </ejb-relationship-role>
-                </ejb-relation>
-            </relationships>
-            <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
-
+            
+            <!--<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
                 <persistence-unit 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>
                     <properties>
-                        <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
-                        <!-- property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DB2Dictionary"/ -->
-                        <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
-                        <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+                        <property name="openjpa.jdbc.DBDictionary" value="db2" />
+                        <property name="openjpa.jdbc.DBDictionary" value="derby" />
                     </properties>
                 </persistence-unit>
-            </persistence>
-
+            </persistence>-->
         </openejb-jar>
     </module>
 
@@ -630,16 +177,14 @@
                         </outbound-resourceadapter>
                     </resourceadapter>
 
-
                     <adminobject>
                         <adminobject-interface>javax.jms.Topic</adminobject-interface>
                         <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
                         <adminobject-instance>
-                            <message-destination-name>TradeStreamerTopic</message-destination-name>
-                            <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
+                            <message-destination-name>jms/DTStreamerTopic3</message-destination-name>
+                            <config-property-setting name="PhysicalName">DTStreamerTopic3</config-property-setting>
                         </adminobject-instance>
                     </adminobject>
-
                 </connector>
             </resource>
         </application-client>
@@ -675,8 +220,6 @@
             <dep:type>rar</dep:type>
         </external-path>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-
-
             <resourceadapter>
                 <outbound-resourceadapter>
                     <connection-definition>
@@ -732,7 +275,6 @@
             <dep:type>rar</dep:type>
         </external-path>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-
             <resourceadapter>
                 <!-- how to connect to the JMS Server -->
                 <resourceadapter-instance>
@@ -786,30 +328,12 @@
                     </connection-definition>
                 </outbound-resourceadapter>
             </resourceadapter>
-
-            <adminobject>
-                <adminobject-interface>javax.jms.Topic</adminobject-interface>
-                <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>TradeStreamerTopic</message-destination-name>
-                    <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
-
-            <adminobject>
-                <adminobject-interface>javax.jms.Queue</adminobject-interface>
-                <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>TradeBrokerQueue</message-destination-name>
-                    <config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
-            
+           
             <adminobject>
                 <adminobject-interface>javax.jms.Topic</adminobject-interface>
                 <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
                 <adminobject-instance>
-                    <message-destination-name>DTStreamerTopic3</message-destination-name>
+                    <message-destination-name>jms/DTStreamerTopic3</message-destination-name>
                     <config-property-setting name="PhysicalName">DTStreamerTopic3</config-property-setting>
                 </adminobject-instance>
             </adminobject>
@@ -818,20 +342,10 @@
                 <adminobject-interface>javax.jms.Queue</adminobject-interface>
                 <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
                 <adminobject-instance>
-                    <message-destination-name>DTBrokerQueue3</message-destination-name>
+                    <message-destination-name>jms/DTBrokerQueue3</message-destination-name>
                     <config-property-setting name="PhysicalName">DTBrokerQueue3</config-property-setting>
                 </adminobject-instance>
             </adminobject>
-            
-            <adminobject>
-                <adminobject-interface>javax.jms.Queue</adminobject-interface>
-                <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>TestQueue</message-destination-name>
-                    <config-property-setting name="PhysicalName">TestQueue</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
-
         </connector>
     </ext-module>
 </application>



Mime
View raw message