geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cjbly...@apache.org
Subject svn commit: r569494 [2/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/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml Fri Aug 24 12:49:14 2007
@@ -19,7 +19,8 @@
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
-    <display-name>DayTraderWeb</display-name>
+    <display-name>DayTrader Web</display-name>
+    
     <filter>
         <display-name>OrdersAlertFilter</display-name>
         <filter-name>OrdersAlertFilter</filter-name>
@@ -29,25 +30,29 @@
         <filter-name>OrdersAlertFilter</filter-name>
         <servlet-name>TradeAppServlet</servlet-name>
     </filter-mapping>
+    
     <listener>
         <listener-class>org.apache.geronimo.samples.daytrader.web.TradeWebContextListener</listener-class>
     </listener>
+    
     <servlet>
         <display-name>TradeAppServlet</display-name>
         <servlet-name>TradeAppServlet</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeAppServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <servlet>
-        <display-name>register</display-name>
-        <servlet-name>register</servlet-name>
-        <jsp-file>/register.jsp</jsp-file>
-    </servlet>
+    
     <servlet>
         <display-name>TestServlet</display-name>
         <servlet-name>TestServlet</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.TestServlet</servlet-class>
     </servlet>
+    
+    <servlet>
+        <display-name>register</display-name>
+        <servlet-name>register</servlet-name>
+        <jsp-file>/register.jsp</jsp-file>
+    </servlet>   
     <servlet>
         <display-name>welcome</display-name>
         <servlet-name>welcome</servlet-name>
@@ -63,11 +68,13 @@
         <servlet-name>tradehome</servlet-name>
         <jsp-file>/tradehome.jsp</jsp-file>
     </servlet>
+    
     <servlet>
         <display-name>TradeConfigServlet</display-name>
         <servlet-name>TradeConfigServlet</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeConfigServlet</servlet-class>
     </servlet>
+    
     <servlet>
         <display-name>TradeScenarioServlet</display-name>
         <servlet-name>TradeScenarioServlet</servlet-name>
@@ -127,6 +134,14 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
+    
+    <servlet>
+        <display-name>org_apache_geronimo_samples_daytrader_TradeWSAction</display-name>
+        <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.soap.TradeWSAction</servlet-class>
+    </servlet>
+    
+    <!-- Web container primitives -->
     <servlet>
         <display-name>ExplicitGC</display-name>
         <servlet-name>ExplicitGC</servlet-name>
@@ -183,71 +198,11 @@
         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingJDBCWrite</servlet-class>
     </servlet>
     <servlet>
-        <display-name>PingServlet2Session</display-name>
-        <servlet-name>PingServlet2Session</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2EntityLocal</display-name>
-        <servlet-name>PingServlet2EntityLocal</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2EntityLocal</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2EntityRemote</display-name>
-        <servlet-name>PingServlet2EntityRemote</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2EntityRemote</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2Session2Entity</display-name>
-        <servlet-name>PingServlet2Session2Entity</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2Entity</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2Session2EntityCollection</display-name>
-        <servlet-name>PingServlet2Session2EntityCollection</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2EntityCollection</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2Session2JDBC</display-name>
-        <servlet-name>PingServlet2Session2JDBC</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2JDBC</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2Session2JDBCCollection</display-name>
-        <servlet-name>PingServlet2Session2JDBCCollection</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2JDBCCollection</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2Session2CMROne2One</display-name>
-        <servlet-name>PingServlet2Session2CMROne2One</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2CMROne2One</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2Session2CMROne2Many</display-name>
-        <servlet-name>PingServlet2Session2CMROne2Many</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2CMROne2Many</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2MDBQueue</display-name>
-        <servlet-name>PingServlet2MDBQueue</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2MDBQueue</servlet-class>
-    </servlet>
-    <servlet>
-        <display-name>PingServlet2MDBTopic</display-name>
-        <servlet-name>PingServlet2MDBTopic</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2MDBTopic</servlet-class>
-    </servlet>
-    <servlet>
         <display-name>PingServlet2JNDI</display-name>
         <servlet-name>PingServlet2JNDI</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2JNDI</servlet-class>
     </servlet>
     <servlet>
-        <display-name>PingServlet2TwoPhase</display-name>
-        <servlet-name>PingServlet2TwoPhase</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2TwoPhase</servlet-class>
-    </servlet>
-    <servlet>
         <display-name>PingServlet2Include</display-name>
         <servlet-name>PingServlet2Include</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Include</servlet-class>
@@ -257,9 +212,9 @@
         <servlet-name>PingServlet2IncludeRcv</servlet-name>
 		<servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2IncludeRcv</servlet-class>
 	</servlet>
+    <!-- End of Web container primitives -->
     
-    <!-- EJB3-based primitives -->
-    
+    <!-- EJB container primitives (EJB3) -->   
     <servlet>
         <servlet-name>ejb3.PingServlet2Session</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session</servlet-class>
@@ -304,16 +259,8 @@
         <servlet-name>ejb3.PingServlet2TwoPhase</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2TwoPhase</servlet-class>
     </servlet>
-
-    <!-- End of EJB3-based primitives -->
+    <!-- End of EJB container primitives (EJB3) -->
     
-    <servlet>
-        <display-name>org_apache_geronimo_samples_daytrader_TradeWSAction</display-name>
-        <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
-        <servlet-class>org.apache.geronimo.samples.daytrader.soap.TradeWSAction</servlet-class>
-    </servlet>
-
-    <!-- [INSERT FRAGMENT HERE] -->
 
     <servlet-mapping>
         <servlet-name>TradeAppServlet</servlet-name>
@@ -335,6 +282,9 @@
         <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
         <url-pattern>/services/TradeWSServices</url-pattern>
     </servlet-mapping>
+    
+    
+    <!-- Web container primitives (Servlet Mappings) -->
     <servlet-mapping>
         <servlet-name>ExplicitGC</servlet-name>
         <url-pattern>/servlet/ExplicitGC</url-pattern>
@@ -380,64 +330,17 @@
         <url-pattern>/servlet/PingJDBCWrite</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>PingServlet2Session</servlet-name>
-        <url-pattern>/servlet/PingServlet2Session</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2EntityLocal</servlet-name>
-        <url-pattern>/servlet/PingServlet2EntityLocal</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2EntityRemote</servlet-name>
-        <url-pattern>/servlet/PingServlet2EntityRemote</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2Session2Entity</servlet-name>
-        <url-pattern>/servlet/PingServlet2Session2Entity</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2Session2EntityCollection</servlet-name>
-        <url-pattern>/servlet/PingServlet2Session2EntityCollection</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2Session2JDBC</servlet-name>
-        <url-pattern>/servlet/PingServlet2Session2JDBC</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2Session2JDBCCollection</servlet-name>
-        <url-pattern>/servlet/PingServlet2Session2JDBCCollection</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2Session2CMROne2One</servlet-name>
-        <url-pattern>/servlet/PingServlet2Session2CMROne2One</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2Session2CMROne2Many</servlet-name>
-        <url-pattern>/servlet/PingServlet2Session2CMROne2Many</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2MDBQueue</servlet-name>
-        <url-pattern>/servlet/PingServlet2MDBQueue</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>PingServlet2MDBTopic</servlet-name>
-        <url-pattern>/servlet/PingServlet2MDBTopic</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
 		<servlet-name>PingServlet2JNDI</servlet-name>
 		<url-pattern>/servlet/PingServlet2JNDI</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
-		<servlet-name>PingServlet2TwoPhase</servlet-name>
-		<url-pattern>/servlet/PingServlet2TwoPhase</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
 		<servlet-name>PingServlet2Include</servlet-name>
 		<url-pattern>/servlet/PingServlet2Include</url-pattern>
 	</servlet-mapping>
+    <!-- End of Web container primitives (Servlet Mappings) -->
 
     
-    <!-- EJB3-based primitives -->   
+    <!-- EJB container primitives (Servlet Mappings) -->   
     <servlet-mapping>
         <servlet-name>ejb3.PingServlet2Session</servlet-name>
         <url-pattern>/ejb3/PingServlet2Session</url-pattern>
@@ -482,8 +385,7 @@
         <servlet-name>ejb3.PingServlet2TwoPhase</servlet-name>
         <url-pattern>/ejb3/PingServlet2TwoPhase</url-pattern>
     </servlet-mapping>
-    
-    <!-- End EJB3-based primitives -->
+    <!-- End of EJB container primitives (Servlet Mappings) -->
     
 
     <session-config>
@@ -500,6 +402,7 @@
         <error-code>500</error-code>
         <location>/error.jsp</location>
     </error-page>
+    
     <resource-ref>
         <res-ref-name>jdbc/TradeDataSource</res-ref-name>
         <res-type>javax.sql.DataSource</res-type>
@@ -518,13 +421,7 @@
         <res-auth>Application</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
-    <ejb-ref>
-        <ejb-ref-name>ejb/Trade</ejb-ref-name>
-        <ejb-ref-type>Session</ejb-ref-type>
-        <home>org.apache.geronimo.samples.daytrader.ejb.TradeHome</home>
-        <remote>org.apache.geronimo.samples.daytrader.ejb.Trade</remote>
-        <ejb-link>TradeEJB</ejb-link>
-    </ejb-ref>
+    
     <ejb-ref>
         <ejb-ref-name>ejb/TradeSLSBBean</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
@@ -537,48 +434,20 @@
         <remote>org.apache.geronimo.samples.daytrader.ejb3.DirectSLSBRemote</remote>
         <ejb-link>DirectSLSBBean</ejb-link>
     </ejb-ref>
-    <ejb-ref>
-        <ejb-ref-name>ejb/TradeJDBC</ejb-ref-name>
-        <ejb-ref-type>Session</ejb-ref-type>
-        <home>org.apache.geronimo.samples.daytrader.session.TradeJDBCHome</home>
-        <remote>org.apache.geronimo.samples.daytrader.session.TradeJDBC</remote>
-        <ejb-link>TradeJDBC</ejb-link>
-    </ejb-ref>
-    <ejb-ref>
-        <ejb-ref-name>ejb/Quote</ejb-ref-name>
-        <ejb-ref-type>Entity</ejb-ref-type>
-        <home>org.apache.geronimo.samples.daytrader.ejb.QuoteHome</home>
-        <remote>org.apache.geronimo.samples.daytrader.ejb.Quote</remote>
-        <ejb-link>QuoteEJB</ejb-link>
-    </ejb-ref>
-    <ejb-local-ref>
-        <ejb-ref-name>ejb/LocalQuote</ejb-ref-name>
-        <ejb-ref-type>Entity</ejb-ref-type>
-        <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalQuoteHome</local-home>
-        <local>org.apache.geronimo.samples.daytrader.ejb.LocalQuote</local>
-        <ejb-link>QuoteEJB</ejb-link>
-    </ejb-local-ref>
-    <ejb-local-ref>
-        <ejb-ref-name>ejb/LocalAccountHome</ejb-ref-name>
-        <ejb-ref-type>Entity</ejb-ref-type>
-        <local-home>org.apache.geronimo.samples.daytrader.ejb.LocalAccountHome</local-home>
-        <local>org.apache.geronimo.samples.daytrader.ejb.LocalAccount</local>
-        <ejb-link>AccountEJB</ejb-link>
-    </ejb-local-ref>
+
     <message-destination-ref>
-        <!--  This is the JNDI name of where the resource will appear -->
-        <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+        <message-destination-ref-name>jms/DTBrokerQueue3</message-destination-ref-name>
         <message-destination-type>javax.jms.Queue</message-destination-type>
         <message-destination-usage>Produces</message-destination-usage>
-        <!--  Must match the message-destination defined later  -->
-        <message-destination-link>dt-ejb.jar#TradeBrokerQueue</message-destination-link>
+        <message-destination-link>dt-ejb.jar#jms/DTBrokerQueue3</message-destination-link>
     </message-destination-ref>
     <message-destination-ref>
-        <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+        <message-destination-ref-name>jms/DTStreamerTopic3</message-destination-ref-name>
         <message-destination-type>javax.jms.Topic</message-destination-type>
         <message-destination-usage>Produces</message-destination-usage>
-        <message-destination-link>dt-ejb.jar#TradeStreamerTopic</message-destination-link>
+        <message-destination-link>dt-ejb.jar#jms/DTStreamerTopic3</message-destination-link>
     </message-destination-ref>
+    
     <service-ref>
         <description>WSDL Service Trade</description>
         <service-ref-name>service/Trade</service-ref-name>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp Fri Aug 24 12:49:14 2007
@@ -243,8 +243,8 @@
 			<B>Trade Max Quotes</B><BR>
 			<INPUT size="25" type="text" name="MaxQuotes"
 				value="<%=TradeConfig.getMAX_QUOTES()%>"></TD>
-			<TD>By default the DayTrader database is populated with 50 users
-			(uid:0 - uid:49) and 100 quotes (s:0 - s:99). <BR>
+			<TD>By default the DayTrader database is populated with 200 users
+			(uid:0 - uid:199) and 400 quotes (s:0 - s:399). <BR>
 			</TD>
 		</TR>
 		<TR>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html Fri Aug 24 12:49:14 2007
@@ -17,8 +17,8 @@
 <HTML>
 <TITLE>DayTrader Version</TITLE>
 <BODY>
-DayTrader Performance Benchmark Sample - 1.2
-<BR>Date: 20061103
-<BR>Contact: <A href="mailto:hogstrom@apache.org?subject=Comments about DayTrader Version 1.2">hogstrom@apache.org</A>
+DayTrader Performance Benchmark Sample - 2.0
+<BR>Date: 20070824
+<BR>Contact: <A href="mailto:hogstrom@apache.org?subject=Comments about DayTrader Version 2.0">hogstrom@apache.org</A>
 </BODY>
 </HTML>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/web_prmtv.html Fri Aug 24 12:49:14 2007
@@ -177,87 +177,80 @@
 		</TR>
 		<TR>
 			<TD colspan="2" bgcolor="#c93333" align="center"><B><FONT
-				color="#FFFFFF">EJB Container ping suite</FONT></B></TD>
+				color="#FFFFFF">EJB 3 Container ping suite</FONT></B></TD>
 		</TR>
 
 		<TR>
-			<TD align="center"><A href="servlet/PingServlet2Session"><FONT
-				size="-1">PingServlet2SessionEJB</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-			<TD><FONT size="-1">PingServlet2SessionEJB tests key function of a
-			servlet call to a stateless SessionEJB. The SessionEJB performs a
+			<TD align="center"><A href="ejb3/PingServlet2Session"><FONT
+				size="-1">PingServlet2Session</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
+			<TD><FONT size="-1">PingServlet2Session tests key function of a
+			servlet call to a stateless Session EJB. The Session EJB performs a
 			simple calculation and returns the result</FONT></TD>
 		</TR>
 		<TR>
-			<TD align="center"><A href="servlet/PingServlet2EntityLocal"><FONT
-				size="-1">PingServlet2EntityEJBLocal</FONT></A><FONT COLOR="#FF0000">*</FONT><BR>
-			<BR>
-			<A href="servlet/PingServlet2EntityRemote"><FONT size="-1">PingServlet2EntityEJBRemote</FONT></A><FONT
-				COLOR="#FF0000">*</FONT></TD>
-			<TD><FONT size="-1">PingServlet2EntityEJB tests key function of a
-			servlet call to an EJB 2.0 Container Managed Entity. In this test the
-			EJB entity represents a single row in the database table. The <B>Local
-			version</B> uses the EJB Local interface while the <B>Remote version</B>
-			uses the Remote EJB interface. (Note: PingServlet2EntityEJBLocal will
-			fail in a multi-tier setup where the Trade Web and EJB apps are
-			seperated.)</FONT></TD>
+			<TD align="center"><A href="ejb3/PingServlet2Entity"><FONT
+				size="-1">PingServlet2Entity</FONT></A><FONT COLOR="#FF0000">*</FONT><BR></TD>
+			<TD><FONT size="-1">PingServlet2Entity tests key function of a
+			servlet call to an EJB 3.0 Container Managed Entity. In this test the
+			EJB entity represents a single row in the database table.</FONT></TD>
 		</TR>
 		<TR>
-			<TD align="center"><A href="servlet/PingServlet2Session2Entity"><FONT
+			<TD align="center"><A href="ejb3/PingServlet2Session2Entity"><FONT
 				size="-1">PingServlet2Session2Entity</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
 			<TD><FONT size="-1">This tests the full servlet to Session EJB to
 			Entity EJB path to retrieve a single row from the database.</FONT></TD>
 		</TR>
 		<TR>
 			<TD align="center"><A
-				href="servlet/PingServlet2Session2EntityCollection"><FONT size="-1">PingServlet2Session2<BR>
+				href="ejb3/PingServlet2Session2EntityCollection"><FONT size="-1">PingServlet2Session2<BR>
 			EntityCollection</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
 			<TD><FONT size="-1">This test extends the previous EJB Entity test by
 			calling a Session EJB which uses a finder method on the Entity that
 			returns a collection of Entity objects. Each object is displayed by
-			the servlet</FONT></TD>
+			the servlet.</FONT></TD>
 		</TR>
 		<TR>
-			<TD align="center"><A href="servlet/PingServlet2Session2CMROne2One"><FONT
+			<TD align="center"><A href="ejb3/PingServlet2Session2CMROne2One"><FONT
 				size="-1">PingServlet2Session2CMROne2One</FONT></A><FONT
 				COLOR="#FF0000">*</FONT></TD>
 			<TD><FONT size="-1">This test drives an Entity EJB to get another
-			Entity EJB's data through an EJB 2.0 CMR One to One relationship </FONT></TD>
+			Entity EJB's data through an EJB 3.0 CMR One to One relationship.</FONT></TD>
 		</TR>
 		<TR>
-			<TD align="center"><A href="servlet/PingServlet2Session2CMROne2Many"><FONT
+			<TD align="center"><A href="ejb3/PingServlet2Session2CMROne2Many"><FONT
 				size="-1">PingServlet2Session2CMROne2Many</FONT></A><FONT
 				COLOR="#FF0000">*</FONT></TD>
 			<TD><FONT size="-1">This test drives an Entity EJB to get another
-			Entity EJB's data through an EJB 2.0 CMR One to Many relationship </FONT></TD>
+			Entity EJB's data through an EJB 3.0 CMR One to Many relationship.</FONT></TD>
 		</TR>
 		<TR>
-			<TD align="center"><A href="servlet/PingServlet2Session2JDBC"><FONT
+			<TD align="center"><A href="ejb3/PingServlet2Session2JDBC"><FONT
 				size="-1">PingServlet2Session2JDBC</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
 			<TD><FONT size="-1">This tests the full servlet to Session EJB to
 			JDBC path to retrieve a single row from the database.</FONT></TD>
 		</TR>
 		<TR>
 			<TD align="center"><A
-				href="servlet/PingServlet2Session2JDBCCollection"><FONT size="-1">PingServlet2Session2<BR>
+				href="ejb3/PingServlet2Session2JDBCCollection"><FONT size="-1">PingServlet2Session2<BR>
 			JDBCCollection</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
 			<TD><FONT size="-1">This test extends the previous JDBC test by
 			calling a Session EJB to JDBC path which returns multiple rows
 			from the database.</FONT></TD>
 		</TR>
 		<TR>
-			<TD align="center"><A href="servlet/PingServlet2MDBQueue"><FONT
+			<TD align="center"><A href="ejb3/PingServlet2MDBQueue"><FONT
 				size="-1">PingServlet2MDBQueue</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
 			<TD><FONT size="-1">PingServlet2MDBQueue drives messages to a Queue
-			based Message Driven EJB (MDB).Each request to the servlet posts a
+			based Message Driven EJB (MDB). Each request to the servlet posts a
 			message to the Queue. The MDB receives the message asynchronously and
 			prints message delivery statistics on each 100th message. <FONT color="red">
 			<B>Note:</B> Not intended for performance testing.</FONT></FONT></TD>
 		</TR>
 		<TR>
-			<TD align="center"><A href="servlet/PingServlet2MDBTopic"><FONT
+			<TD align="center"><A href="ejb3/PingServlet2MDBTopic"><FONT
 				size="-1">PingServlet2MDBTopic</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
 			<TD><FONT size="-1">PingServlet2MDBTopic drives messages to a Topic
-			based Publish/Subscribe Message Driven EJB (MDB).Each request to the
+			based Publish/Subscribe Message Driven EJB (MDB). Each request to the
 			servlet posts a message to the Topic. The TradeStreamMDB receives the
 			message asynchronously and prints message delivery statistics on each
 			100th message. Other subscribers to the Topic will also receive the
@@ -265,7 +258,7 @@
 			testing.</FONT></FONT></TD>
 		</TR>
 		<TR>
-			<TD align="center"><A href="servlet/PingServlet2TwoPhase"><FONT
+			<TD align="center"><A href="ejb3/PingServlet2TwoPhase"><FONT
 				size="-1">PingServlet2TwoPhase</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
 			<TD><FONT size="-1">PingServlet2TwoPhase drives a Session EJB which
 			invokes an Entity EJB with findByPrimaryKey (DB Access) followed by
@@ -273,54 +266,6 @@
 			These operations are wrapped in a global 2-phase transaction and
 			commit.</FONT></TD>
 		</TR>
-
-        <TR>
-            <TD colspan="2" bgcolor="#c93333" align="center"><B><FONT color="#FFFFFF">EJB 3 Container ping suite</FONT></B></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2Session"><FONT size="-1">PingServlet2Session</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to Stateless Session Remote</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2Entity"><FONT size="-1">PingServlet2Entity</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to Entity Bean</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2Session2Entity"><FONT size="-1">PingServlet2Session2Entity</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to Session 2 Entity Bean</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2Session2EntityCollection"><FONT size="-1">PingServlet2Session2EntityCollection</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to Session 2 Entity Collection</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2Session2CMROne2One"><FONT size="-1">PingServlet2Session2CMROne2One</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to Session 2 CMR One to One</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2Session2CMROne2Many"><FONT size="-1">PingServlet2Session2CMROne2Many</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to Session 2 CMR One to Many</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2Session2CMROne2Many"><FONT size="-1">PingServlet2Session2JDBC</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to Session 2 JDBC</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2Session2JDBCCollection"><FONT size="-1">PingServlet2Session2JDBCCollection</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to Session 2 JDBC Collection</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2MDBQueue"><FONT size="-1">PingServlet2MDBQueue</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to MDB Queue</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2MDBTopic"><FONT size="-1">PingServlet2MDBTopic</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to MDB Topic</FONT></TD>
-        </TR>
-        <TR>
-            <TD align="center"><A href="ejb3/PingServlet2TwoPhase"><FONT size="-1">PingServlet2TwoPhase</FONT></A><FONT COLOR="#FF0000">*</FONT></TD>
-            <TD><FONT size="-1">Ping Servlet to Two Phase</FONT></TD>
-        </TR>
 	</TBODY>
 </TABLE>
 </BODY>

Modified: geronimo/daytrader/trunk/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/pom.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/pom.xml Fri Aug 24 12:49:14 2007
@@ -42,10 +42,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-qname_1.1_spec</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

Modified: geronimo/daytrader/trunk/modules/wsappclient/src/main/java/org/apache/geronimo/samples/daytrader/client/ws/ClientApp.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/src/main/java/org/apache/geronimo/samples/daytrader/client/ws/ClientApp.java?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/src/main/java/org/apache/geronimo/samples/daytrader/client/ws/ClientApp.java (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/src/main/java/org/apache/geronimo/samples/daytrader/client/ws/ClientApp.java Fri Aug 24 12:49:14 2007
@@ -106,9 +106,37 @@
     private JProgressBar jProgressBar = null;
     private JButton jButton10 = null;
     private JPanel jPanel11 = null;
+    
+    
 
     public static void main(String[] args) {
-        new ClientApp();
+        boolean waitForMain = false;
+        
+        try {
+            if (args.length > 0) {
+                if (args[0].equals("-waitForMain")) {
+                    waitForMain = true;
+                } else {
+                    System.out.println("Usage ClientApp [-waitForMain]");
+                    System.exit(1);
+                }
+            }
+            
+            ClientApp wsapp = new ClientApp();
+        
+            // Added the "waitForMain" flag to disable/enable the workaround below        
+            if (waitForMain) {
+                // Geronimo client terminates JVM process when Main completes (not sure why)
+                // even though client GUI is still active. For now, force Main to remain alive
+                // until GUI is closed.
+                
+                while (wsapp.isVisible())
+                    Thread.sleep(5000);
+            }
+        } catch (Exception e) {
+            System.err.println("Caught an unexpected exception!");
+            e.printStackTrace();
+        }
     }
 
     public ClientApp() {

Modified: geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml Fri Aug 24 12:49:14 2007
@@ -60,6 +60,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">
@@ -78,486 +83,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>
 
@@ -625,8 +190,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>
 
@@ -766,8 +331,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>
 
@@ -775,8 +340,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-db2-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-db2-plan.xml?rev=569494&r1=569493&r2=569494&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-db2-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-db2-plan.xml Fri Aug 24 12:49:14 2007
@@ -60,6 +60,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">
@@ -78,486 +83,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>
 
@@ -625,8 +190,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>
 
@@ -766,8 +331,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>
 
@@ -775,8 +340,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>
 



Mime
View raw message