geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r395900 [1/5] - in /geronimo/daytrader/trunk: ./ modules/derby/ 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/s...
Date Fri, 21 Apr 2006 14:36:27 GMT
Author: hogstrom
Date: Fri Apr 21 07:36:22 2006
New Revision: 395900

URL: http://svn.apache.org/viewcvs?rev=395900&view=rev
Log:
Mega commit moving to new look and feel

Added:
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml
    geronimo/daytrader/trunk/modules/streamer/src/main/resources/images/
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/footer.html
    geronimo/daytrader/trunk/modules/web/src/main/webapp/header.html
Removed:
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/tradeLogo.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/tradeLogoSmall.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/topBanner.html
Modified:
    geronimo/daytrader/trunk/modules/derby/createDB.sh
    geronimo/daytrader/trunk/modules/derby/derby.txt
    geronimo/daytrader/trunk/modules/ear/pom.xml
    geronimo/daytrader/trunk/modules/ejb/pom.xml
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml
    geronimo/daytrader/trunk/modules/streamer/pom.xml
    geronimo/daytrader/trunk/modules/streamer/src/main/java/Main.java
    geronimo/daytrader/trunk/modules/web/pom.xml
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/account.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/accountImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/config.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/contentHome.html
    geronimo/daytrader/trunk/modules/web/src/main/webapp/displayQuote.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/benchmarking.html
    geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeFAQ.html
    geronimo/daytrader/trunk/modules/web/src/main/webapp/docs/tradeversion.html
    geronimo/daytrader/trunk/modules/web/src/main/webapp/error.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/about.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/bottomRedBar.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/configuration.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/copyRight.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/faq.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/home.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/primitives.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/reports.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/topRedBar.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/images/tradingAndPortfolios.gif
    geronimo/daytrader/trunk/modules/web/src/main/webapp/index.html
    geronimo/daytrader/trunk/modules/web/src/main/webapp/marketSummary.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/order.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/orderImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/portfolio.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/portfolioImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/quote.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/quoteImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/register.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/registerImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/tradehome.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/tradehomeImg.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/welcome.jsp
    geronimo/daytrader/trunk/modules/web/src/main/webapp/welcomeImg.jsp
    geronimo/daytrader/trunk/modules/wsappclient/pom.xml
    geronimo/daytrader/trunk/plans/dayTrader-plan.xml
    geronimo/daytrader/trunk/pom.xml

Modified: geronimo/daytrader/trunk/modules/derby/createDB.sh
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/derby/createDB.sh?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/derby/createDB.sh (original)
+++ geronimo/daytrader/trunk/modules/derby/createDB.sh Fri Apr 21 07:36:22 2006
@@ -4,12 +4,13 @@
   echo Please define the GERONIMO_HOME environment variable.
   exit
 fi
-export G_PATH=${GERONIMO_HOME}/repository/org.apache.derby/jars
-export CLASSPATH=${G_PATH}/derby-10.1.1.0.jar
-export CLASSPATH=${CLASSPATH}:${G_PATH}/derbynet-10.1.1.0.jar
-export CLASSPATH=${CLASSPATH}:${G_PATH}/derbytools-10.1.1.0.jar
-export CLASSPATH=${CLASSPATH}:${G_PATH}/derbyclient-10.1.1.0.jar
+export G_PATH=${GERONIMO_HOME}/repository/org/apache/derby/
+export CLASSPATH=${G_PATH}/derby/10.1.1.0/derby-10.1.1.0.jar
+export CLASSPATH=${CLASSPATH}:${G_PATH}/derbynet/10.1.1.0/derbynet-10.1.1.0.jar
+export CLASSPATH=${CLASSPATH}:${G_PATH}/derbytools/10.1.1.0/derbytools-10.1.1.0.jar
+export CLASSPATH=${CLASSPATH}:${G_PATH}/derbyclient/10.1.1.0/derbyclient-10.1.1.0.jar
 export
 echo "Invoking IJ command line tool to create the database and tables...please wait"
 java -Dij.driver=org.apache.derby.jdbc.ClientDriver -Dij.protocol=jdbc:derby://localhost:1527/ org.apache.derby.tools.ij < derby.txt
+#java -Dij.driver=org.apache.derby.jdbc.ClientDriver -Dij.protocol=jdbc:derby://localhost:1527/ org.apache.derby.tools.ij 
 echo "Table creation complete"

Modified: geronimo/daytrader/trunk/modules/derby/derby.txt
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/derby/derby.txt?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/derby/derby.txt (original)
+++ geronimo/daytrader/trunk/modules/derby/derby.txt Fri Apr 21 07:36:22 2006
@@ -1,3 +1,3 @@
-connect 'jdbc:derby://localhost:1527/tradedb;create=true';
-run 'Table.ddl';
+connect 'jdbc:derby://localhost:1527/DaytraderDatabase;create=true';
+run 'src/sql/daytrader.sql';
 commit;

Modified: geronimo/daytrader/trunk/modules/ear/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ear/pom.xml?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Fri Apr 21 07:36:22 2006
@@ -14,25 +14,23 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo.samples.daytrader</groupId>
-      <artifactId>daytrader-wsappclient</artifactId>
-      <version>1.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.samples.daytrader</groupId>
       <artifactId>daytrader-web</artifactId>
-      <version>1.1-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.samples.daytrader</groupId>
       <artifactId>daytrader-ejb</artifactId>
-      <version>1.1-SNAPSHOT</version>
       <type>ejb</type>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.samples.daytrader</groupId>
       <artifactId>daytrader-streamer</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.samples.daytrader</groupId>
+      <artifactId>daytrader-wsappclient</artifactId>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
   <build>
@@ -44,16 +42,6 @@
           <description>DayTrader Stock Trading Performance Benchmark Sample</description>
           <version>1.4</version>
           <modules>
-            <javaModule>
-              <groupId>org.apache.geronimo.samples.daytrader</groupId>
-              <artifactId>daytrader-streamer</artifactId>
-              <includeInApplicationXml>true</includeInApplicationXml>
-            </javaModule>
-            <javaModule>
-              <groupId>org.apache.geronimo.samples.daytrader</groupId>
-              <artifactId>daytrader-wsappclient</artifactId>
-              <includeInApplicationXml>true</includeInApplicationXml>
-            </javaModule>
             <webModule>
               <groupId>org.apache.geronimo.samples.daytrader</groupId>
               <artifactId>daytrader-web</artifactId>

Modified: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/pom.xml?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Fri Apr 21 07:36:22 2006
@@ -1,75 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.geronimo.samples.daytrader</groupId>
-    <artifactId>daytrader</artifactId>
-    <version>1.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>daytrader-ejb</artifactId>
-  <name>DayTrader :: EJBs</name>
-  <packaging>ejb</packaging>
-  <description>Daytrader EJBs</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.samples.daytrader</groupId>
-      <artifactId>daytrader-wsappclient</artifactId>
-      <version>1.1-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
-      <!-- Caveat: We need a provided scope to make the deployment in Geronimo work -->
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-ejb-plugin</artifactId>
-        <configuration>
-           <generateClient>true</generateClient>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <configuration>
-          <container>
-            <containerId>jboss4x</containerId>
-            <zipUrlInstaller>
-              <url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.0.2.zip</url>
-              <installDir>${java.io.tmpdir}/cargo-installs</installDir>
-            </zipUrlInstaller>
-          </container>
-          <configuration>
-            <dir>${project.build.directory}/jboss</dir>
-          </configuration>
-        </configuration>
-        <!-- Configuration to do hot deployment to a running JBoss container
-        <configuration>
-          <container>
-            <containerId>jboss4x</containerId>
-            <type>remote</type>
-          </container>
-        </configuration>
-        -->
-      </plugin>
-    </plugins>
-  </build>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.geronimo.samples.daytrader</groupId>
+		<artifactId>daytrader</artifactId>
+		<version>1.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>daytrader-ejb</artifactId>
+	<name>DayTrader :: EJBs</name>
+	<packaging>ejb</packaging>
+	<description>Daytrader EJBs</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.samples.daytrader</groupId>
+			<artifactId>daytrader-wsappclient</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-j2ee_1.4_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-ejb-plugin</artifactId>
+				<configuration>
+					<generateClient>true</generateClient>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.cargo</groupId>
+				<artifactId>cargo-maven2-plugin</artifactId>
+				<configuration>
+					<container>
+						<containerId>jboss4x</containerId>
+						<zipUrlInstaller>
+							<url>
+								http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.0.2.zip
+							</url>
+							<installDir>
+								${java.io.tmpdir}/cargo-installs
+							</installDir>
+						</zipUrlInstaller>
+					</container>
+					<configuration>
+						<dir>${project.build.directory}/jboss</dir>
+					</configuration>
+				</configuration>
+				<!-- Configuration to do hot deployment to a running JBoss container
+					<configuration>
+					<container>
+					<containerId>jboss4x</containerId>
+					<type>remote</type>
+					</container>
+					</configuration>
+				-->
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java Fri Apr 21 07:36:22 2006
@@ -73,8 +73,8 @@
 	public static int cachingType = NO_CACHING;
 	
 	/* Trade Database Scaling parameters*/
-	private static int MAX_USERS = 500;
-	private static int MAX_QUOTES = 1000;
+	private static int MAX_USERS = 50;
+	private static int MAX_QUOTES = 100;
 
 	/* Trade Database specific paramters */
 	public static String JDBC_UID = null;

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java Fri Apr 21 07:36:22 2006
@@ -1427,7 +1427,7 @@
 
 			conn = getConn();
 
-			quoteData = getQuoteForUpdate(conn, symbol);		
+			quoteData = getQuoteForUpdate(conn, symbol);
 			BigDecimal oldPrice = quoteData.getPrice();
 			double newVolume = quoteData.getVolume() + sharesTraded;
 
@@ -2238,28 +2238,65 @@
 				Log.trace("TradeDirect: init");			
 			context = new InitialContext();
 			datasource = (DataSource) context.lookup(dsName);			
+        }
+        catch (Exception e)
+        {
+            Log.error("TradeDirect:init -- error on JNDI lookups of DataSource -- TradeDirect will not work", e);
+            return;
+        }           
 			
-			tradeHome = (TradeHome) ( javax.rmi.PortableRemoteObject.narrow(
+		try {
+
+             tradeHome = (TradeHome) ( javax.rmi.PortableRemoteObject.narrow(
 			context.lookup("java:comp/env/ejb/Trade"), TradeHome.class));
-			
-		}
-		catch (Exception e)
-		{
-			Log.error("TradeDirect:init -- error on JNDI lookups of DataSource -- TradeDirect will not work", e);
-			return;
-		}			
-		try
-		{
-			qConnFactory = (ConnectionFactory) context.lookup("java:comp/env/jms/QueueConnectionFactory");
-			queue = (Queue) context.lookup("java:comp/env/jms/TradeBrokerQueue");
-			tConnFactory = (ConnectionFactory) context.lookup("java:comp/env/jms/TopicConnectionFactory");
-			streamerTopic = (Topic) context.lookup("java:comp/env/jms/TradeStreamerTopic");
-		}
-		catch (Exception e)
-		{
-			Log.error("TradeDirect:init  Unable to lookup JMS Resources\n\t -- Asynchronous mode will not work correctly and Quote Price change publishing will be disabled",e);
-			publishQuotePriceChange = false;			
-		}		
+        }
+        catch (Exception e)
+        {
+            Log.error("TradeDirect:init -- error on JNDI lookup of Trade Session Bean -- TradeDirect will not work", e);
+            return;
+        }           
+        
+        try
+        {
+            qConnFactory = (ConnectionFactory) context.lookup("java:comp/env/jms/QueueConnectionFactory");
+        }
+        catch (Exception e)
+        {
+            Log.error("TradeDirect:init  Unable to locate QueueConnectionFactory.\n\t -- Asynchronous mode will not work correctly and Quote Price change publishing will be disabled");
+            publishQuotePriceChange = false;            
+        }       
+        
+        try
+        {
+            queue = (Queue) context.lookup("java:comp/env/jms/TradeBrokerQueue");
+        }
+        catch (Exception e)
+        {
+            Log.error("TradeDirect:init  Unable to locate TradeBrokerQueue.\n\t -- Asynchronous mode will not work correctly and Quote Price change publishing will be disabled");
+            publishQuotePriceChange = false;            
+        }       
+        
+        try
+        {
+            tConnFactory = (ConnectionFactory) context.lookup("java:comp/env/jms/TopicConnectionFactory");
+        }
+        catch (Exception e)
+        {
+            Log.error("TradeDirect:init  Unable to locate TopicConnectionFactory.\n\t -- Asynchronous mode will not work correctly and Quote Price change publishing will be disabled");
+            publishQuotePriceChange = false;            
+        }
+        
+        try
+        {
+            streamerTopic = (Topic) context.lookup("java:comp/env/jms/TradeStreamerTopic");
+        }
+        catch (Exception e)
+        {
+            Log.error("TradeDirect:init  Unable to locate TradeStreamerTopic.\n\t -- Asynchronous mode will not work correctly and Quote Price change publishing will be disabled");
+            publishQuotePriceChange = false;            
+        }       
+        
+        
 		try
 		{
 			tradeEJB = (Trade) tradeHome.create();					

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java Fri Apr 21 07:36:22 2006
@@ -1130,9 +1130,9 @@
 			try
 			{
 				qConnFactory = (ConnectionFactory) ic.lookup("java:comp/env/jms/QueueConnectionFactory");
-				queue = (Queue) ic.lookup("java:comp/env/jms/TradeBrokerQueue");
-				tConnFactory = (ConnectionFactory) ic.lookup("java:comp/env/jms/TopicConnectionFactory");
+                 tConnFactory = (ConnectionFactory) ic.lookup("java:comp/env/jms/TopicConnectionFactory");
 				streamerTopic = (Topic) ic.lookup("java:comp/env/jms/TradeStreamerTopic");
+                 queue = (Queue) ic.lookup("java:comp/env/jms/TradeBrokerQueue");
 			}
 			catch (Exception e)
 			{

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml Fri Apr 21 07:36:22 2006
@@ -2,7 +2,7 @@
 <ejb-jar version="2.1"
     xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"> 
-    <display-name>DayTraderEJBs</display-name>
+    <display-name>TradeEJBs</display-name>
     <enterprise-beans>
         <session>
             <description>Trade Session EJB manages all Trading services</description>
@@ -28,13 +28,13 @@
                 <env-entry-type>java.lang.Boolean</env-entry-type>
                 <env-entry-value>true</env-entry-value>
             </env-entry>
-            <!--ejb-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-local-ref>
                 <ejb-ref-name>ejb/Quote</ejb-ref-name>
                 <ejb-ref-type>Entity</ejb-ref-type>
@@ -370,7 +370,7 @@
                 <ejb-ql>SELECT OBJECT(q) FROM Quote q WHERE q.symbol LIKE 's:1__'</ejb-ql>
             </query>
             <query>
-                <query-method id="QueryMethod_21">
+                <query-method>
                     <method-name>findByPrimaryKeyForUpdate</method-name>
                     <method-params>
                         <method-param>java.lang.String</method-param>

Added: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml?rev=395900&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml (added)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jboss.xml Fri Apr 21 07:36:22 2006
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+     <entity>
+     <ejb-name>QuoteEJB</ejb-name>
+     <jndi-name>Quote</jndi-name>
+     </entity>
+     
+     <entity>
+     <ejb-name>AccountEJB</ejb-name>
+     <jndi-name>Account</jndi-name>
+     </entity>
+     
+     <entity>
+     <ejb-name>HoldingEJB</ejb-name>
+     <jndi-name>Holding</jndi-name>
+     </entity>
+     
+     <entity>
+     <ejb-name>OrderEJB</ejb-name>
+     <jndi-name>Order</jndi-name>
+     </entity>
+     
+     <entity>
+     <ejb-name>AccountProfileEJB</ejb-name>
+     <jndi-name>AccountProfile</jndi-name>
+     </entity>
+     
+      <entity>
+     <ejb-name>KeyGenEJB</ejb-name>
+     <jndi-name>KeyGen</jndi-name>
+     </entity>
+           
+        
+
+      
+     <session>
+         <ejb-name>TradeEJB</ejb-name>
+         <jndi-name>ejb/Trade</jndi-name>
+          
+           <ejb-ref>
+               <ejb-ref-name>ejb/Trade</ejb-ref-name>
+               <jndi-name>Trade</jndi-name>
+            </ejb-ref>
+            
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/Quote</ejb-ref-name>
+               <local-jndi-name>Quote</local-jndi-name>
+            </ejb-local-ref>
+            
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/Account</ejb-ref-name>
+               <local-jndi-name>Account</local-jndi-name>
+            </ejb-local-ref>
+            
+            
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/Holding</ejb-ref-name>
+               <local-jndi-name>Holding</local-jndi-name>
+            </ejb-local-ref>
+            
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/Order</ejb-ref-name>
+               <local-jndi-name>Order</local-jndi-name>
+            </ejb-local-ref>
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/KeySequence</ejb-ref-name>
+               <local-jndi-name>KeySequence</local-jndi-name>
+            </ejb-local-ref>
+            <ejb-local-ref>
+               <ejb-ref-name>ejb/AccountProfile</ejb-ref-name>
+               <local-jndi-name>AccountProfile</local-jndi-name>
+             </ejb-local-ref>
+            
+               
+            <resource-ref>
+               <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
+               <jndi-name>ConnectionFactory</jndi-name>
+            </resource-ref>
+            
+            <resource-ref>
+               <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
+               <jndi-name>ConnectionFactory</jndi-name>
+            </resource-ref>
+            
+             <resource-ref>
+               <res-ref-name>jdbc/TradeDataSource</res-ref-name>
+               <jndi-name>jdbc/TradeDataSource</jndi-name>
+            </resource-ref>
+
+
+            <message-destination-ref>
+                <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+                <jndi-name>TradeBrokerQueue</jndi-name>
+            </message-destination-ref>
+            <message-destination-ref>
+                <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+                <jndi-name>TradeStreamerTopic</jndi-name>
+            </message-destination-ref>
+                
+      </session>
+   
+   
+        <session>
+         <ejb-name>KeySequenceEJB</ejb-name>
+         <jndi-name>KeySequence</jndi-name>
+
+      </session>   
+  
+      <message-driven>
+         <ejb-name>TradeStreamerMDB</ejb-name> 
+         <destination-jndi-name>TradeStreamerTopic</destination-jndi-name>  
+      </message-driven>
+      
+      <message-driven>
+         <ejb-name>TradeBrokerMDB</ejb-name>   
+         <destination-jndi-name>TradeBrokerQueue</destination-jndi-name> 
+         <ejb-ref>
+         <ejb-ref-name>ejb/Trade</ejb-ref-name>
+         <jndi-name>Trade</jndi-name>
+         </ejb-ref>                      
+      </message-driven>
+  
+  
+
+   </enterprise-beans>
+  
+   <resource-managers>
+          <resource-manager>
+               <res-name>jms/QueueConnectionFactory</res-name>
+               <res-jndi-name>ConnectionFactory</res-jndi-name>
+            </resource-manager>
+            
+            <resource-manager>
+               <res-name>jms/TopicConnectionFactory</res-name>
+               <res-jndi-name>ConnectionFactory</res-jndi-name>
+            </resource-manager>
+            
+            <resource-manager>
+               <res-name>jms/TradeStreamerTopic</res-name>
+               <res-jndi-name>TradeStreamerTopic</res-jndi-name>
+            </resource-manager>
+            
+            <resource-manager>
+               <res-name>jms/TradeBrokerQueue</res-name>
+               <res-jndi-name>TradeBrokerQueue</res-jndi-name>
+            </resource-manager>
+            
+             <resource-manager>
+               <res-name>jdbc/TradeDataSource</res-name>
+               <res-jndi-name>jdbc/TradeDataSource</res-jndi-name>
+            </resource-manager>
+
+   </resource-managers> 
+
+  <!--
+    | for container settings, you can merge in jboss-container.xml
+    | this can contain <invoker-proxy-bindings/> and <container-configurations/>
+  -->
+
+</jboss>

Added: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml?rev=395900&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml (added)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml Fri Apr 21 07:36:22 2006
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+   <datasource>jdbc/TradeDataSource</datasource>
+   <datasource-mapping>DB2</datasource-mapping>
+   </defaults>
+
+   <enterprise-beans>
+   <entity>
+   <ejb-name>QuoteEJB</ejb-name>
+   <table-name>QuoteEJB</table-name>
+    <cmp-field>
+               <field-name>open</field-name>
+               <column-name>open1</column-name>
+                <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+                <cmp-field>
+               <field-name>change</field-name>
+               <column-name>change1</column-name>
+               <jdbc-type>DOUBLE</jdbc-type>
+               <sql-type>DOUBLE</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>low</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>price</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>high</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>volume</field-name>
+               <jdbc-type>DOUBLE</jdbc-type>
+               <sql-type>DOUBLE</sql-type>
+            </cmp-field>
+             <cmp-field>
+            <field-name>companyName</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+             <cmp-field>
+            <field-name>symbol</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+   </entity>
+   <entity>
+   <ejb-name>OrderEJB</ejb-name>
+   <cmp-field>
+               <field-name>price</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(10,2)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>orderFee</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+             <field-name>completionDate</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+            <cmp-field>
+            <field-name>orderType</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+             <cmp-field>
+            <field-name>orderStatus</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>quantity</field-name>
+               <jdbc-type>DOUBLE</jdbc-type>
+               <sql-type>DOUBLE</sql-type>
+            </cmp-field>
+              <cmp-field>
+             <field-name>openDate</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>orderID</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+            <!-- cmp-field>
+               <field-name>account_accountid</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER(4)</sql-type>
+            </cmp-field>
+              <cmp-field>
+            <field-name>quote_symbol</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>holding_holdingid</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER(4)</sql-type>
+            </cmp-field>   -->
+   </entity>
+   <entity>
+   <ejb-name>AccountEJB</ejb-name>
+               <cmp-field>
+               <field-name>logoutCount</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+              <cmp-field>
+               <field-name>loginCount</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+              <cmp-field>
+               <field-name>accountID</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+                <cmp-field>
+             <field-name>balance</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC</sql-type>
+            </cmp-field>
+                <cmp-field>
+             <field-name>openBalance</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC</sql-type>
+            </cmp-field>
+            <cmp-field>
+             <field-name>creationDate</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+                <cmp-field>
+            <field-name>lastLogin</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+              <!-- cmp-field>
+            <field-name>profile_userid</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>    -->
+   </entity>
+   <entity>
+   <ejb-name>AccountProfileEJB</ejb-name>
+       <cmp-field>
+               <field-name>address</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>password</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>userID</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>email</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>creditCard</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+            <cmp-field>
+               <field-name>fullName</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>
+   </entity>
+  <entity>
+   <ejb-name>HoldingEJB</ejb-name>
+              <cmp-field>
+               <field-name>purchasePrice</field-name>
+               <jdbc-type>NUMERIC</jdbc-type>
+               <sql-type>NUMERIC(14,2)</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>holdingID</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+             <cmp-field>
+               <field-name>quantity</field-name>
+               <jdbc-type>DOUBLE</jdbc-type>
+               <sql-type>DOUBLE</sql-type>
+            </cmp-field>
+             <cmp-field>
+             <field-name>purchaseDate</field-name>
+               <jdbc-type>TIMESTAMP</jdbc-type>
+               <sql-type>TIMESTAMP</sql-type>
+            </cmp-field>
+             <!--  Xcmp-field>
+               <field-name>account_accountID</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+              <cmp-field>
+            <field-name>quote-symbol</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field>   -->
+   </entity>
+   <entity>
+   <ejb-name>KeyGenEJB</ejb-name>
+    <!-- cmp-field>
+               <field-name>keyval</field-name>
+               <jdbc-type>INTEGER</jdbc-type>
+               <sql-type>INTEGER</sql-type>
+            </cmp-field>
+              <cmp-field>
+            <field-name>keyname</field-name>
+               <jdbc-type>VARCHAR</jdbc-type>
+               <sql-type>VARCHAR(250)</sql-type>
+            </cmp-field> -->
+   </entity>
+  
+
+   </enterprise-beans>
+   <relationships>
+    <ejb-relation>
+            <ejb-relation-name>Account-Orders</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>accountID</field-name>
+            <column-name>ACCOUNT_ACCOUNTID</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>Order-Has-Account</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+    
+    <ejb-relation>
+            <ejb-relation-name>Account-AccountProfile</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>Account-Has-AccountProfile</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>AccountProfileEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>userID</field-name>
+            <column-name>PROFILE_USERID</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+    
+    <ejb-relation>
+            <ejb-relation-name>Account-Holdings</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>accountID</field-name>
+            <column-name>ACCOUNT_ACCOUNTID</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>Holding-Has-Account</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+            
+    </ejb-relation>
+    
+        <ejb-relation>
+            <ejb-relation-name>Quote-Holdings</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>Holding-Has-Quote</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>QuoteEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>symbol</field-name>
+            <column-name>QUOTE_SYMBOL</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+    
+        <ejb-relation>
+            <ejb-relation-name>Quote-Orders</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>Order-Has-Quote</ejb-relationship-role-name>
+            <key-fields></key-fields>
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>QuoteEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>symbol</field-name>
+            <column-name>QUOTE_SYMBOL</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+    
+        <ejb-relation>
+            <ejb-relation-name>Order-Holding</ejb-relation-name>
+            <foreign-key-mapping/>
+            <ejb-relationship-role>
+              <ejb-relationship-role-name>Order-Has-Holding</ejb-relationship-role-name>
+            <key-fields/>
+            <!--  key-field><field-name>orderID</field-name><column-name>ORDERID2</column-name></key-field></key-fields>
+             -->
+            </ejb-relationship-role>
+            <ejb-relationship-role>
+            <ejb-relationship-role-name>HoldingEJB</ejb-relationship-role-name>
+            <key-fields>
+            <key-field>
+            <field-name>holdingID</field-name>
+            <column-name>HOLDING_HOLDINGID</column-name>
+            </key-field>
+            </key-fields>
+            </ejb-relationship-role>
+    </ejb-relation>
+
+ 
+   </relationships>
+
+</jbosscmp-jdbc>

Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/streamer/pom.xml?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Fri Apr 21 07:36:22 2006
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                                   http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.geronimo.samples.daytrader</groupId>

Modified: geronimo/daytrader/trunk/modules/streamer/src/main/java/Main.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/streamer/src/main/java/Main.java?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/src/main/java/Main.java (original)
+++ geronimo/daytrader/trunk/modules/streamer/src/main/java/Main.java Fri Apr 21 07:36:22 2006
@@ -15,9 +15,11 @@
  *  limitations under the License.
  */
 
+/**
+ * Dummy Main module for Streamer client.
+ */
 public class Main {
 	public static void main(String[] args) {
-		// TODO Auto-generated method stub
 	}
 
 	/* (non-Java-doc)
@@ -27,4 +29,4 @@
 		super();
 	}
 
-}
\ No newline at end of file
+}

Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/pom.xml?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Fri Apr 21 07:36:22 2006
@@ -1,149 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.geronimo.samples.daytrader</groupId>
-    <artifactId>daytrader</artifactId>
-    <version>1.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>daytrader-web</artifactId>
-  <name>DayTrader :: Web Application</name>
-  <packaging>war</packaging>
-  <description>Daytrader Web</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.samples.daytrader</groupId>
-      <artifactId>daytrader-ejb</artifactId>
-      <version>1.1-SNAPSHOT</version>
-      <!-- Caveat: it should be ejb-client but the daytrader build is not quite perfect yet... -->
-      <type>ejb</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-      <version>1.0</version>
-      <!-- Caveat: Issue with the Jetty6 plugin not including provided scope. This is because Maven does
-           not seem to pass provided scope deps. To make the in-place deployment work the scope has to be
-           compile -->
-      <!--scope>compile</scope-->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <filters>
-            <filter>${basedir}/src/main/webapp/WEB-INF/classes/build.properties</filter>
-          </filters>
-          <resources>
-            <resource implementation="org.apache.maven.model.Resource">
-              <filtering>true</filtering>
-              <directory>${basedir}/src/main/webapp/WEB-INF</directory>
-              <includes>
-                <include>web.xml</include>
-              </includes>
-            </resource>
-          </resources>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty6-plugin</artifactId>
-        <configuration>
-          <scanIntervalSeconds>10</scanIntervalSeconds>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <configuration>
-          <container>
-            <containerId>tomcat5x</containerId>
-            <zipUrlInstaller>
-              <url>http://www.apache.org/dist/jakarta/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.zip</url>
-              <installDir>${java.io.tmpdir}/cargo-installs</installDir>
-            </zipUrlInstaller>
-          </container>
-          <configuration>
-            <dir>${project.build.directory}/tomcat</dir>
-          </configuration>
-        </configuration>
-        <!-- Configuration to use when Tomcat is already installed on your machine
-        <configuration>
-          <container>
-            <containerId>tomcat5x</containerId>
-            <home>c:/apps/jakarta-tomcat-5.0.30</home>
-          </container>
-          <configuration>
-            <dir>${project.build.directory}/tomcat</dir>
-          </configuration>
-        </configuration>
-        -->
-        <!-- Configuration to do hot deployment to a running Tomcat container
-        <configuration>
-          <container>
-            <containerId>tomcat5x</containerId>
-            <type>remote</type>
-          </container>
-          <configuration>
-            <type>runtime</type>
-            <properties>
-              <cargo.remote.username>username</cargo.remote.username>
-              <cargo.remote.password>password</cargo.remote.password>
-            </properties>
-          </configuration>
-        </configuration>
-        -->
-        <!-- Configuration to use when doing a local deployment
-        <configuration>
-          <container>
-            <containerId>tomcat5x</containerId>
-            <home>c:/apps/jakarta-tomcat-5.0.30</home>
-          </container>
-          <configuration>
-            <type>existing</type>
-            <dir>c:/apps/jakarta-tomcat-5.0.30</dir>
-          </configuration>
-        </configuration>
-        -->
-      </plugin>
-      <!-- Test for doing in-place development with Cargo and Jetty
-      <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <configuration>
-          <container>
-            <log>container.log</log>
-            <dependencies>
-              <dependency>
-                <location>${project.build.outputDirectory}</location>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.geronimo.samples.daytrader</groupId>
-                <artifactId>daytrader-ejb</artifactId>
-                <type>ejb</type>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-              </dependency>
-            </dependencies>
-          </container>
-          <configuration>
-            <dir>${project.build.directory}/tomcat</dir>            
-            <deployables>
-              <deployable>
-                <location>${basedir}/src/main/webapp</location>
-              </deployable>
-            </deployables>
-          </configuration>
-        </configuration>
-      </plugin>
-      -->
-    </plugins>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
+                             http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.geronimo.samples.daytrader</groupId>
+		<artifactId>daytrader</artifactId>
+		<version>1.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>daytrader-web</artifactId>
+	<name>DayTrader :: Web Application</name>
+	<packaging>war</packaging>
+	<description>Daytrader Web</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.samples.daytrader</groupId>
+			<artifactId>daytrader-ejb</artifactId>
+			<scope>provided</scope>
+			<type>ejb</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.samples.daytrader</groupId>
+			<artifactId>daytrader-wsappclient</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.samples.daytrader</groupId>
+			<artifactId>daytrader-streamer</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.samples.daytrader</groupId>
+			<artifactId>daytrader-ejb</artifactId>
+			<scope>provided</scope>
+			<type>ejb</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-j2ee_1.4_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<filters>
+						<filter>
+							${basedir}/src/main/webapp/WEB-INF/classes/build.properties
+						</filter>
+					</filters>
+					<resources>
+						<resource
+							implementation="org.apache.maven.model.Resource">
+							<filtering>true</filtering>
+							<directory>
+								${basedir}/src/main/webapp/WEB-INF
+							</directory>
+							<includes>
+								<include>web.xml</include>
+							</includes>
+						</resource>
+					</resources>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty6-plugin</artifactId>
+				<configuration>
+					<scanIntervalSeconds>10</scanIntervalSeconds>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.cargo</groupId>
+				<artifactId>cargo-maven2-plugin</artifactId>
+				<configuration>
+					<container>
+						<containerId>tomcat5x</containerId>
+						<zipUrlInstaller>
+							<url>
+								http://www.apache.org/dist/jakarta/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.zip
+							</url>
+							<installDir>
+								${java.io.tmpdir}/cargo-installs
+							</installDir>
+						</zipUrlInstaller>
+					</container>
+					<configuration>
+						<dir>${project.build.directory}/tomcat</dir>
+					</configuration>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java Fri Apr 21 07:36:22 2006
@@ -27,213 +27,177 @@
 import org.apache.geronimo.samples.daytrader.*;
 
 /**
- *
- * TradeAppServlet provides the standard web interface to Trade and can be accessed with the Go Trade! link. 
- * Driving benchmark load using this interface requires a sophisticated web load generator that is capable of 
- * filling HTML forms and posting dynamic data.
+ * 
+ * TradeAppServlet provides the standard web interface to Trade and can be
+ * accessed with the Go Trade! link. Driving benchmark load using this interface
+ * requires a sophisticated web load generator that is capable of filling HTML
+ * forms and posting dynamic data.
  */
 
 public class TradeAppServlet extends HttpServlet {
 
-   /**
-	* Servlet initialization method.
-	*/	
-	public void init(ServletConfig config) throws ServletException
-	{
-		super.init(config);
-		java.util.Enumeration en = config.getInitParameterNames();
-		while ( en.hasMoreElements() )
-		{
-			String parm = (String) en.nextElement();
-			String value = config.getInitParameter(parm);
-			TradeConfig.setConfigParam(parm, value);
-		}
-		try
-		{
-			TradeDirect.init();		
-		}
-		catch (Exception e)
-		{
-			Log.error(e, "TradeAppServlet:init -- Error initializing TradeDirect");
-		}
-	}
-	
-	
-   /**
-	* Returns a string that contains information about TradeScenarioServlet
-	*
-	* @return The servlet information
-	*/
-	public java.lang.String getServletInfo()
-	{
-		return "TradeAppServlet provides the standard web interface to Trade";
-	}	
-
-
-   /**
-	* Process incoming HTTP GET requests
-	*
-	* @param request Object that encapsulates the request to the servlet
-	* @param response Object that encapsulates the response from the servlet
-	*/
-	public void doGet(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
-		throws ServletException, IOException
-	{
-		performTask(request,response);
-	}
-
-   /**
-	* Process incoming HTTP POST requests
-	*
-	* @param request Object that encapsulates the request to the servlet
-	* @param response Object that encapsulates the response from the servlet
-	*/
-	public void doPost(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
-		throws ServletException, IOException
-	{
-		performTask(request,response);
-	}	
-
-   /**
-	* Main service method for TradeAppServlet
-	*
-	* @param request Object that encapsulates the request to the servlet
-	* @param response Object that encapsulates the response from the servlet
-	*/    	
-	public void performTask(HttpServletRequest req, HttpServletResponse resp)
-		throws ServletException, IOException {
-
-		String action = null;
-		String userID = null;
-		// String to create full dispatch path to TradeAppServlet w/ request Parameters
-		String dispPath = null; // Dispatch Path to TradeAppServlet
-
-
-		resp.setContentType("text/html");
-		TradeServletAction tsAction = new TradeServletAction();
-
-
-		//Dyna - need status string - prepended to output
-			action = req.getParameter("action");
-
-
-			ServletContext ctx = getServletConfig().getServletContext();
-
-			if (action == null)
-			{
-				tsAction.doWelcome(ctx, req, resp, "");
-				return;
-			}
-			else if (action.equals("login"))
-			{
-				userID = req.getParameter("uid");
-				String passwd = req.getParameter("passwd");
-				String inScenario = req.getParameter("inScenario");
-				tsAction.doLogin(ctx, req, resp, userID, passwd);
-				return;
-			}
-			else if (action.equals("register"))
-			{
-				userID = req.getParameter("user id");
-				String passwd = req.getParameter("passwd");
-				String cpasswd = req.getParameter("confirm passwd");
-				String fullname = req.getParameter("Full Name");
-				String ccn = req.getParameter("Credit Card Number");
-				String money = req.getParameter("money");
-				String email = req.getParameter("email");
-				String smail = req.getParameter("snail mail");
-				tsAction.doRegister(
-					ctx, 
-					req, 
-					resp, 
-					userID, 
-					passwd, 
-					cpasswd, 
-					fullname, 
-					ccn, 
-					money, 
-					email, 
-					smail); 
-				return;
-			}
-
-			// The rest of the operations require the user to be logged in -
-			//Get the Session and validate the user.
-			HttpSession session = req.getSession();
-			userID = (String) session.getAttribute("uidBean");
-
-			if (userID == null)
-			{
-				System.out.println("TradeAppServlet service error: User Not Logged in");
-				tsAction.doWelcome(ctx, req, resp, "User Not Logged in");
-				return;
-			}
-			if ( action.equals("quotes"))
-			{
-				String symbols = req.getParameter("symbols");
-				tsAction.doQuotes(ctx, req, resp, userID, symbols);
-			}
-			else if (action.equals("buy"))
-			{
-				String symbol = req.getParameter("symbol");
-				String quantity = req.getParameter("quantity");
-				tsAction.doBuy(ctx, req, resp, userID, symbol, quantity);
-			}
-			else if (action.equals("sell"))
-			{
-				int holdingID = Integer.parseInt(req.getParameter("holdingID"));
-				tsAction.doSell(ctx, req, resp, userID, new Integer(holdingID));
-			}
-			else if (action.equals("portfolio") || action.equals("portfolioNoEdge"))
-			{
-				tsAction.doPortfolio(ctx, req, resp, userID, "Portfolio as of " + new java.util.Date());
-			}
-			else if (action.equals("logout"))
-			{
-				tsAction.doLogout(ctx, req, resp, userID);
-			}
-			else if (action.equals("home"))
-			{
-				tsAction.doHome(ctx, req, resp, userID, "Ready to Trade");
-			}
-			else if (action.equals("account"))
-			{
-				tsAction.doAccount(ctx, req, resp, userID, "");
-			}
-			else if (action.equals("update_profile"))
-			{
-				String   password = req.getParameter("password");				
-				String  cpassword = req.getParameter("cpassword");								
-				String   fullName = req.getParameter("fullname");
-				String    address = req.getParameter("address");
-				String creditcard = req.getParameter("creditcard");
-				String      email = req.getParameter("email");
-				tsAction.doAccountUpdate(
-					ctx, 
-					req, 
-					resp, 
-					userID, 
-					password   == null? "":password.trim(),
-					cpassword  == null? "":cpassword.trim(),
-					fullName   == null? "":fullName.trim(), 
-					address    == null? "":address.trim(), 
-					creditcard == null? "":creditcard.trim(), 
-					email      == null? "":email.trim()); 
-			}
-			else
-			{
-				System.out.println("TradeAppServlet: Invalid Action=" + action);
-				tsAction.doWelcome(ctx, req, resp, "TradeAppServlet: Invalid Action" + action);
-			}
-	}
-
-		
-	private void sendRedirect(HttpServletResponse resp, String page)
-		throws ServletException, IOException {
-		resp.sendRedirect(resp.encodeRedirectURL(page));
-	}
-
-	// URL Path Prefix for dispatching to TradeAppServlet
-	private final static String tasPathPrefix = "/app?action=";
-			
+    /**
+     * Servlet initialization method.
+     */
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+        java.util.Enumeration en = config.getInitParameterNames();
+        while (en.hasMoreElements()) {
+            String parm = (String) en.nextElement();
+            String value = config.getInitParameter(parm);
+            TradeConfig.setConfigParam(parm, value);
+        }
+        try {
+            TradeDirect.init();
+        } catch (Exception e) {
+            Log.error(e,
+                    "TradeAppServlet:init -- Error initializing TradeDirect");
+        }
+    }
+
+    /**
+     * Returns a string that contains information about TradeScenarioServlet
+     * 
+     * @return The servlet information
+     */
+    public java.lang.String getServletInfo() {
+        return "TradeAppServlet provides the standard web interface to Trade";
+    }
+
+    /**
+     * Process incoming HTTP GET requests
+     * 
+     * @param request
+     *            Object that encapsulates the request to the servlet
+     * @param response
+     *            Object that encapsulates the response from the servlet
+     */
+    public void doGet(javax.servlet.http.HttpServletRequest request,
+            javax.servlet.http.HttpServletResponse response)
+            throws ServletException, IOException {
+        performTask(request, response);
+    }
+
+    /**
+     * Process incoming HTTP POST requests
+     * 
+     * @param request
+     *            Object that encapsulates the request to the servlet
+     * @param response
+     *            Object that encapsulates the response from the servlet
+     */
+    public void doPost(javax.servlet.http.HttpServletRequest request,
+            javax.servlet.http.HttpServletResponse response)
+            throws ServletException, IOException {
+        performTask(request, response);
+    }
+
+    /**
+     * Main service method for TradeAppServlet
+     * 
+     * @param request
+     *            Object that encapsulates the request to the servlet
+     * @param response
+     *            Object that encapsulates the response from the servlet
+     */
+    public void performTask(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+
+        String action = null;
+        String userID = null;
+        // String to create full dispatch path to TradeAppServlet w/ request
+        // Parameters
+        String dispPath = null; // Dispatch Path to TradeAppServlet
+
+        resp.setContentType("text/html");
+        TradeServletAction tsAction = new TradeServletAction();
+
+        // Dyna - need status string - prepended to output
+        action = req.getParameter("action");
+
+        ServletContext ctx = getServletConfig().getServletContext();
+
+        if (action == null) {
+            tsAction.doWelcome(ctx, req, resp, "");
+            return;
+        } else if (action.equals("login")) {
+            userID = req.getParameter("uid");
+            String passwd = req.getParameter("passwd");
+            String inScenario = req.getParameter("inScenario");
+            tsAction.doLogin(ctx, req, resp, userID, passwd);
+            return;
+        } else if (action.equals("register")) {
+            userID = req.getParameter("user id");
+            String passwd = req.getParameter("passwd");
+            String cpasswd = req.getParameter("confirm passwd");
+            String fullname = req.getParameter("Full Name");
+            String ccn = req.getParameter("Credit Card Number");
+            String money = req.getParameter("money");
+            String email = req.getParameter("email");
+            String smail = req.getParameter("snail mail");
+            tsAction.doRegister(ctx, req, resp, userID, passwd, cpasswd,
+                    fullname, ccn, money, email, smail);
+            return;
+        }
+
+        // The rest of the operations require the user to be logged in -
+        // Get the Session and validate the user.
+        HttpSession session = req.getSession();
+        userID = (String) session.getAttribute("uidBean");
+
+        if (userID == null) {
+            System.out
+                    .println("TradeAppServlet service error: User Not Logged in");
+            tsAction.doWelcome(ctx, req, resp, "User Not Logged in");
+            return;
+        }
+        if (action.equals("quotes")) {
+            String symbols = req.getParameter("symbols");
+            tsAction.doQuotes(ctx, req, resp, userID, symbols);
+        } else if (action.equals("buy")) {
+            String symbol = req.getParameter("symbol");
+            String quantity = req.getParameter("quantity");
+            tsAction.doBuy(ctx, req, resp, userID, symbol, quantity);
+        } else if (action.equals("sell")) {
+            int holdingID = Integer.parseInt(req.getParameter("holdingID"));
+            tsAction.doSell(ctx, req, resp, userID, new Integer(holdingID));
+        } else if (action.equals("portfolio")
+                || action.equals("portfolioNoEdge")) {
+            tsAction.doPortfolio(ctx, req, resp, userID, "Portfolio as of "
+                    + new java.util.Date());
+        } else if (action.equals("logout")) {
+            tsAction.doLogout(ctx, req, resp, userID);
+        } else if (action.equals("home")) {
+            tsAction.doHome(ctx, req, resp, userID, "Ready to Trade");
+        } else if (action.equals("account")) {
+            tsAction.doAccount(ctx, req, resp, userID, "");
+        } else if (action.equals("update_profile")) {
+            String password = req.getParameter("password");
+            String cpassword = req.getParameter("cpassword");
+            String fullName = req.getParameter("fullname");
+            String address = req.getParameter("address");
+            String creditcard = req.getParameter("creditcard");
+            String email = req.getParameter("email");
+            tsAction.doAccountUpdate(ctx, req, resp, userID,
+                    password == null ? "" : password.trim(),
+                    cpassword == null ? "" : cpassword.trim(),
+                    fullName == null ? "" : fullName.trim(),
+                    address == null ? "" : address.trim(),
+                    creditcard == null ? "" : creditcard.trim(),
+                    email == null ? "" : email.trim());
+        } else {
+            System.out.println("TradeAppServlet: Invalid Action=" + action);
+            tsAction.doWelcome(ctx, req, resp,
+                    "TradeAppServlet: Invalid Action" + action);
+        }
+    }
+
+    private void sendRedirect(HttpServletResponse resp, String page)
+            throws ServletException, IOException {
+        resp.sendRedirect(resp.encodeRedirectURL(page));
+    }
+
+    // URL Path Prefix for dispatching to TradeAppServlet
+    private final static String tasPathPrefix = "/app?action=";
+
 }

Modified: geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java?rev=395900&r1=395899&r2=395900&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java Fri Apr 21 07:36:22 2006
@@ -26,7 +26,7 @@
 import org.apache.geronimo.samples.daytrader.*;
 
 /**
- * TradeConfigServlet provides a servlet interface to adjust Trade runtime parameters.
+ * TradeConfigServlet provides a servlet interface to adjust DayTrader runtime parameters.
  * TradeConfigServlet updates values in the {@link org.apache.geronimo.samples.daytrader.web.TradeConfig} JavaBean holding 
  * all configuration and runtime parameters for the Trade application
  *
@@ -334,13 +334,13 @@
 			action = req.getParameter("action");
 			if (action == null)
 			{
-				doConfigDisplay(req, resp, result + "Current Trade Configuration:");
+				doConfigDisplay(req, resp, result + "<b><br>Current DayTrader Configuration:</br></b>");
 				return;
 			}
 			else if (action.equals("updateConfig"))
 			{
 				doConfigUpdate(req, resp);
-				result = "<B><BR>Trade Configuration Updated</BR></B>";
+				result = "<B><BR>DayTrader Configuration Updated</BR></B>";
 			}
 			else if (action.equals("resetTrade"))
 			{
@@ -351,9 +351,9 @@
 			{
 				resp.setContentType("text/html");
                                 new TradeBuildDB(resp.getWriter());
-				result = "Trade Database Built - " + TradeConfig.getMAX_USERS() + "users created";
+				result = "DayTrader Database Built - " + TradeConfig.getMAX_USERS() + "users created";
 			}
-			doConfigDisplay(req, resp, result + "Current Trade Configuration:");
+			doConfigDisplay(req, resp, result + "Current DayTrader Configuration:");
 		}
 		catch (Exception e)
 		{



Mime
View raw message