You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2006/04/29 19:45:32 UTC

svn commit: r398211 - in /geronimo/daytrader/trunk: ./ modules/derby/src/sql/ modules/ejb/ modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/ modules/ejb/src/main/resources/META-INF/ modules/web/

Author: jgenender
Date: Sat Apr 29 10:45:30 2006
New Revision: 398211

URL: http://svn.apache.org/viewcvs?rev=398211&view=rev
Log:
Fixed SQL error and fixed packaging.  Works for JBoss and mysql.

Modified:
    geronimo/daytrader/trunk/modules/derby/src/sql/daytrader.sql
    geronimo/daytrader/trunk/modules/ejb/pom.xml
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/direct/TradeDirect.java
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml
    geronimo/daytrader/trunk/modules/web/pom.xml
    geronimo/daytrader/trunk/pom.xml

Modified: geronimo/daytrader/trunk/modules/derby/src/sql/daytrader.sql
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/derby/src/sql/daytrader.sql?rev=398211&r1=398210&r2=398211&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/derby/src/sql/daytrader.sql (original)
+++ geronimo/daytrader/trunk/modules/derby/src/sql/daytrader.sql Sat Apr 29 10:45:30 2006
@@ -1,85 +1,85 @@
---DROP TABLE HOLDINGEJB;
---DROP TABLE ACCOUNTPROFILEEJB;
---DROP TABLE QUOTEEJB;
---DROP TABLE KEYGENEJB;
---DROP TABLE ACCOUNTEJB;
---DROP TABLE ORDEREJB;
-
-CREATE TABLE HOLDINGEJB
-  (PURCHASEPRICE DECIMAL(10, 2),
-   HOLDINGID INTEGER NOT NULL,
-   QUANTITY DOUBLE NOT NULL,
-   PURCHASEDATE TIMESTAMP,
-   ACCOUNT_ACCOUNTID INTEGER,
-   QUOTE_SYMBOL VARCHAR(250));
-
-ALTER TABLE HOLDINGEJB
-  ADD CONSTRAINT PK_HOLDINGEJB PRIMARY KEY (HOLDINGID);
-
-CREATE TABLE ACCOUNTPROFILEEJB
-  (ADDRESS VARCHAR(250),
-   PASSWORD VARCHAR(250),
-   USERID VARCHAR(250) NOT NULL,
-   EMAIL VARCHAR(250),
-   CREDITCARD VARCHAR(250),
-   FULLNAME VARCHAR(250));
-
-ALTER TABLE ACCOUNTPROFILEEJB
-  ADD CONSTRAINT PK_ACCOUNTPROFILE2 PRIMARY KEY (USERID);
-
-CREATE TABLE QUOTEEJB
-  (LOW DECIMAL(10, 2),
-   OPEN1 DECIMAL(10, 2),
-   VOLUME DOUBLE NOT NULL,
-   PRICE DECIMAL(10, 2),
-   HIGH DECIMAL(10, 2),
-   COMPANYNAME VARCHAR(250),
-   SYMBOL VARCHAR(250) NOT NULL,
-   CHANGE1 DOUBLE NOT NULL);
-
-ALTER TABLE QUOTEEJB
-  ADD CONSTRAINT PK_QUOTEEJB PRIMARY KEY (SYMBOL);
-
-CREATE TABLE KEYGENEJB
-  (KEYVAL INTEGER NOT NULL,
-   KEYNAME VARCHAR(250) NOT NULL);
-
-ALTER TABLE KEYGENEJB
-  ADD CONSTRAINT PK_KEYGENEJB PRIMARY KEY (KEYNAME);
-
-CREATE TABLE ACCOUNTEJB
-  (CREATIONDATE TIMESTAMP,
-   OPENBALANCE DECIMAL(10, 2),
-   LOGOUTCOUNT INTEGER NOT NULL,
-   BALANCE DECIMAL(10, 2),
-   ACCOUNTID INTEGER NOT NULL,
-   LASTLOGIN TIMESTAMP,
-   LOGINCOUNT INTEGER NOT NULL,
+--drop table holdingejb;
+--drop table accountprofileejb;
+--drop table quoteejb;
+--drop table keygenejb;
+--drop table accountejb;
+--drop table orderejb;
+
+create table holdingejb
+  (purchaseprice decimal(10, 2),
+   holdingid integer not null,
+   quantity double not null,
+   purchasedate timestamp,
+   account_accountid integer,
+   quote_symbol varchar(250));
+
+alter table holdingejb
+  add constraint pk_holdingejb primary key (holdingid);
+
+create table accountprofileejb
+  (address varchar(250),
+   password varchar(250),
+   userid varchar(250) not null,
+   email varchar(250),
+   creditcard varchar(250),
+   fullname varchar(250));
+
+alter table accountprofileejb
+  add constraint pk_accountprofile2 primary key (userid);
+
+create table quoteejb
+  (low decimal(10, 2),
+   open1 decimal(10, 2),
+   volume double not null,
+   price decimal(10, 2),
+   high decimal(10, 2),
+   companyname varchar(250),
+   symbol varchar(250) not null,
+   change1 double not null);
+
+alter table quoteejb
+  add constraint pk_quoteejb primary key (symbol);
+
+create table keygenejb
+  (keyval integer not null,
+   keyname varchar(250) not null);
+
+alter table keygenejb
+  add constraint pk_keygenejb primary key (keyname);
+
+create table accountejb
+  (creationdate timestamp,
+   openbalance decimal(10, 2),
+   logoutcount integer not null,
+   balance decimal(10, 2),
+   accountid integer not null,
+   lastlogin timestamp,
+   logincount integer not null,
    PROFILE_USERID VARCHAR(250));
 
-ALTER TABLE ACCOUNTEJB
-  ADD CONSTRAINT PK_ACCOUNTEJB PRIMARY KEY (ACCOUNTID);
+alter table accountejb
+  add constraint pk_accountejb primary key (accountid);
 
-CREATE TABLE ORDEREJB
-  (ORDERFEE DECIMAL(10, 2),
-   COMPLETIONDATE TIMESTAMP,
-   ORDERTYPE VARCHAR(250),
-   ORDERSTATUS VARCHAR(250),
-   PRICE DECIMAL(10, 2),
-   QUANTITY DOUBLE NOT NULL,
-   OPENDATE TIMESTAMP,
-   ORDERID INTEGER NOT NULL,
-   ACCOUNT_ACCOUNTID INTEGER,
-   QUOTE_SYMBOL VARCHAR(250),
-   HOLDING_HOLDINGID INTEGER);
-
-ALTER TABLE ORDEREJB
-  ADD CONSTRAINT PK_ORDEREJB PRIMARY KEY (ORDERID);
-
-CREATE INDEX profile_userid on accountejb(profile_userid);
-CREATE INDEX account_accountid on holdingejb(account_accountid);
-CREATE INDEX account_accountidt on orderejb(account_accountid);
-CREATE INDEX holding_holdingid on orderejb(holding_holdingid);
-CREATE INDEX orderstatus on orderejb(orderstatus);
-CREATE INDEX ordertype on orderejb(ordertype);
+create table orderejb
+  (orderfee decimal(10, 2),
+   completiondate timestamp,
+   ordertype varchar(250),
+   orderstatus varchar(250),
+   price decimal(10, 2),
+   quantity double not null,
+   opendate timestamp,
+   orderid integer not null,
+   account_accountid integer,
+   quote_symbol varchar(250),
+   holding_holdingid integer);
+
+alter table orderejb
+  add constraint pk_orderejb primary key (orderid);
+
+create index profile_userid on accountejb(profile_userid);
+create index account_accountid on holdingejb(account_accountid);
+create index account_accountidt on orderejb(account_accountid);
+create index holding_holdingid on orderejb(holding_holdingid);
+create index orderstatus on orderejb(orderstatus);
+create index ordertype on orderejb(ordertype);
   

Modified: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/pom.xml?rev=398211&r1=398210&r2=398211&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Sat Apr 29 10:45:30 2006
@@ -1,53 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <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>geronimo</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>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb</connection>
-    <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ejb</url>
-  </scm>
-	<dependencies>
-		<dependency>
-			<groupId>geronimo</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>
-		</plugins>
-	</build>
+    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>geronimo</groupId>
+        <artifactId>daytrader</artifactId>
+        <version>1.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <groupId>geronimo</groupId>
+    <artifactId>daytrader-ejb</artifactId>
+    <version>${daytraderVersion}</version>
+    <name>DayTrader :: EJBs</name>
+    <packaging>ejb</packaging>
+    <description>Daytrader EJBs</description>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ejb</url>
+    </scm>
+    <dependencies>
+        <dependency>
+            <groupId>geronimo</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>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-ejb-plugin</artifactId>
+                <configuration>
+                    <generateClient>true</generateClient>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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=398211&r1=398210&r2=398211&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 Sat Apr 29 10:45:30 2006
@@ -1852,7 +1852,7 @@
             rowCount = stmt.executeUpdate();
             stmt.close();
             
-            stmt = getStatement(conn, "delete from accountejb where accountejb.accountid in (select accountid from accountejb a where a.profile_userid like 'ru:%')");
+            stmt = getStatement(conn, "delete from accountejb where profile_userid like 'ru:%'");
             int newUserCount = stmt.executeUpdate();
             runStatsData.setNewUserCount(newUserCount);
             stmt.close();           
@@ -2093,17 +2093,17 @@
 
 	private static final String createAccountSQL =
 		"insert into accountejb " +
-		"( accountID, creationDate, openBalance, balance, lastLogin, loginCount, logoutCount, profile_userid) " +
+		"( accountid, creationDate, openBalance, balance, lastLogin, loginCount, logoutCount, profile_userid) " +
 		"VALUES (  ?  ,  ?  ,  ?  ,  ?  ,  ?  ,  ?  ,  ?  ,  ?  )";
 
 	private static final String createAccountProfileSQL =
 		"insert into accountprofileejb " +
-		"( userID, password, fullname, address, email, creditcard ) " +
+		"( userid, password, fullname, address, email, creditcard ) " +
 		"VALUES (  ?  ,  ?  ,  ?  ,  ?  ,  ?  ,  ?  )";
 
 	private static final String createHoldingSQL  = 
 		"insert into holdingejb " +
-		"( holdingID, purchaseDate, purchasePrice, quantity, quote_symbol, account_accountid ) " +
+		"( holdingid, purchaseDate, purchasePrice, quantity, quote_symbol, account_accountid ) " +
 		"VALUES (  ?  ,  ?  ,  ?  ,  ?  ,  ?  ,  ? )";
 
 	private static final String createOrderSQL = 
@@ -2112,7 +2112,7 @@
 		"VALUES (  ?  ,  ?  ,  ?  ,  ?  ,  ?  ,  ?  ,  ?  , ? , ? , ?)";
 
 	private static final String removeHoldingSQL  = 
-		"delete from holdingejb where holdingID = ?";
+		"delete from holdingejb where holdingid = ?";
 
 	private static final String removeHoldingFromOrderSQL  = 		
 		"update orderejb set holding_holdingid=null where holding_holdingid = ?";
@@ -2125,17 +2125,17 @@
 
 	private final static String loginSQL=
 		"update accountejb set lastLogin=?, logincount=logincount+1 " +
-		"where profile_userID=?";
+		"where profile_userid=?";
 
 	private static final String logoutSQL = 
 		"update accountejb set logoutcount=logoutcount+1 " +
 		"where profile_userid=?";
 	
 	private static final String getAccountSQL  = 
-		"select * from accountEJB a where a.accountid = ?";
+		"select * from accountejb a where a.accountid = ?";
 
 	private static final String getAccountForUpdateSQL  = 
-		"select * from accountEJB a where a.accountid = ? For Update";
+		"select * from accountejb a where a.accountid = ? for update";
 
 	private final static String getAccountProfileSQL = 
 		"select * from accountprofileejb ap where ap.userid = " + 
@@ -2143,15 +2143,15 @@
 
 	private final static String getAccountProfileForAccountSQL = 
 		"select * from accountprofileejb ap where ap.userid = " + 
-		"(select profile_userid from accountejb a where a.accountID=?)";
+		"(select profile_userid from accountejb a where a.accountid=?)";
 
 	private static final String getAccountForUserSQL  = 
-		"select * from accountEJB a where a.profile_userid = " +
+		"select * from accountejb a where a.profile_userid = " +
 		"( select userid from accountprofileejb ap where ap.userid = ?)";
 
 	private static final String getAccountForUserForUpdateSQL  = 
-		"select * from accountEJB a where a.profile_userid = " +
-		"( select userid from accountprofileejb ap where ap.userid = ?) For Update";
+		"select * from accountejb a where a.profile_userid = " +
+		"( select userid from accountprofileejb ap where ap.userid = ?) for update";
 
 	private static final String getHoldingSQL  = 
 		"select * from holdingejb h where h.holdingid = ?";

Modified: 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=398211&r1=398210&r2=398211&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/jbosscmp-jdbc.xml Sat Apr 29 10:45:30 2006
@@ -4,7 +4,7 @@
 <jbosscmp-jdbc>
    <defaults>
    <datasource>jdbc/TradeDataSource</datasource>
-   <datasource-mapping>DB2</datasource-mapping>
+   <datasource-mapping>${jboss.mapping}</datasource-mapping>
    </defaults>
 
    <enterprise-beans>

Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/pom.xml?rev=398211&r1=398210&r2=398211&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Sat Apr 29 10:45:30 2006
@@ -28,18 +28,12 @@
 		<dependency>
 			<groupId>geronimo</groupId>
 			<artifactId>daytrader-wsappclient</artifactId>
-			<scope>compile</scope>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>geronimo</groupId>
 			<artifactId>daytrader-streamer</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>geronimo</groupId>
-			<artifactId>daytrader-ejb</artifactId>
 			<scope>provided</scope>
-			<type>ejb</type>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
@@ -84,33 +78,11 @@
 							${basedir}/src/main/webapp/WEB-INF/classes/build.properties
 						</filter>
 					</filters>
-					<ejbModule>
-						<groupId>
-							geronimo
-						</groupId>
-						<artifactId>daytrader-ejb</artifactId>
-						<bundleFileName>dt-ejb.jar</bundleFileName>
-					</ejbModule>
-					<javaModule>
-						<groupId>
-							geronimo
-						</groupId>
-						<artifactId>daytrader-streamer</artifactId>
-						<bundleFileName>
-							streamer.jar
-						</bundleFileName>
-					</javaModule>
-					<javaModule>
-						<groupId>
-							geronimo
-						</groupId>
-						<artifactId>
-							daytrader-wsappclient
-						</artifactId>
-						<bundleFileName>
-							wsappclient.jar
-						</bundleFileName>
-					</javaModule>
+                    <archive>
+                        <manifestEntries>
+                            <Classpath>dt-ejb.jar streamer.jar wsappclient.jar</Classpath>
+                        </manifestEntries> 
+                    </archive>
 					
 					<resources>
 						<resource

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/pom.xml?rev=398211&r1=398210&r2=398211&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Sat Apr 29 10:45:30 2006
@@ -1,136 +1,189 @@
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>geronimo</groupId>
-  <artifactId>daytrader</artifactId>
-  <name>DayTrader :: Performance Benchmark Sample</name>
-  <packaging>pom</packaging>
-  <version>1.1-SNAPSHOT</version>
-  <description>J2EE 1.4 Performance Benchmark Sample Application</description>
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/GERONIMO</url>
-  </issueManagement>
-  <ciManagement>
-    <system>continuum</system>
-    <url>http://ci.gbuild.org/continuum</url>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>scm@geronimo.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2005</inceptionYear>
-  <developers>
-    <developer>
-      <name>Matt Hogstrom</name>
-      <id>hogstrom</id>
-      <email>hogstrom@apache.org</email>
-      <organization>Apache Software Foundation</organization>
-      <roles>
-        <role>Performance Analysis</role>
-      </roles>
-      <timezone>+5</timezone>
-    </developer>
-    <developer>
-      <name>Vincent Massol</name>
-      <id>vmassol</id>
-      <email>vmassol@apache.org</email>
-      <organization>Apache Software Foundation</organization>
-      <roles>
-        <role>Build Engineer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Christopher Blythe</name>
-      <roles>
-        <role>Added code to improve stability and new features</role>
-      </roles>
-    </contributor>
-    <contributor>
-      <name>Stan (John) Cox</name>
-      <roles>
-        <role>Original Developer</role>
-      </roles>
-      <timezone>+5</timezone>
-    </contributor>
-    <contributor>
-      <name>Andrew Spyker</name>
-      <roles>
-        <role>Added the WSAppClient</role>
-      </roles>
-      <timezone>+5</timezone>
-    </contributor>
-  </contributors>
-  <dependencies/>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/</connection>
-    <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/geronimo/gbuild/trunk/</url>
-  </scm>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-  <modules>
-    <module>modules/ejb</module>
-    <module>modules/web</module>
-    <module>modules/streamer</module>
-    <module>modules/wsappclient</module>
-    <module>modules/ear</module>
-  </modules>
-  <dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>daytrader-wsappclient</artifactId>
-      <version>1.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>daytrader-streamer</artifactId>
-      <version>1.1-SNAPSHOT</version>
-    </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>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>daytrader-ejb</artifactId>
-      <version>1.1-SNAPSHOT</version>
-      <type>ejb</type>
-    </dependency>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>daytrader-web</artifactId>
-      <version>1.1-SNAPSHOT</version>
-      <type>war</type>
-    </dependency>
-  </dependencies>
-  </dependencyManagement>
-  <profiles>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>geronimo</groupId>
+    <artifactId>daytrader</artifactId>
+    <name>DayTrader :: Performance Benchmark Sample</name>
+    <packaging>pom</packaging>
+    <version>1.1-SNAPSHOT</version>
+    <description>J2EE 1.4 Performance Benchmark Sample Application</description>
+    <issueManagement>
+        <system>jira</system>
+        <url>http://issues.apache.org/jira/browse/GERONIMO</url>
+    </issueManagement>
+    <ciManagement>
+        <system>continuum</system>
+        <url>http://ci.gbuild.org/continuum</url>
+        <notifiers>
+            <notifier>
+                <configuration>
+                    <address>scm@geronimo.apache.org</address>
+                </configuration>
+            </notifier>
+        </notifiers>
+    </ciManagement>
+    <inceptionYear>2005</inceptionYear>
+    <properties>
+        <!--
+        |
+        | daytrader module versions
+        |
+        -->
+        <daytraderVersion>1.1-SNAPSHOT</daytraderVersion>
+    </properties>
+
+    <developers>
+        <developer>
+            <name>Jeff Genender</name>
+            <id>jgenender</id>
+            <email>jgenender@apache.org</email>
+            <organization>Apache Software Foundation</organization>
+            <roles>
+                <role>Development</role>
+            </roles>
+            <timezone>+7</timezone>
+        </developer>
+        <developer>
+            <name>Matt Hogstrom</name>
+            <id>hogstrom</id>
+            <email>hogstrom@apache.org</email>
+            <organization>Apache Software Foundation</organization>
+            <roles>
+                <role>Performance Analysis</role>
+            </roles>
+            <timezone>+5</timezone>
+        </developer>
+        <developer>
+            <name>Vincent Massol</name>
+            <id>vmassol</id>
+            <email>vmassol@apache.org</email>
+            <organization>Apache Software Foundation</organization>
+            <roles>
+                <role>Build Engineer</role>
+            </roles>
+            <timezone>+1</timezone>
+        </developer>
+    </developers>
+    <contributors>
+        <contributor>
+            <name>Christopher Blythe</name>
+            <roles>
+                <role>Added code to improve stability and new features</role>
+            </roles>
+        </contributor>
+        <contributor>
+            <name>Stan (John) Cox</name>
+            <roles>
+                <role>Original Developer</role>
+            </roles>
+            <timezone>+5</timezone>
+        </contributor>
+        <contributor>
+            <name>Andrew Spyker</name>
+            <roles>
+                <role>Added the WSAppClient</role>
+            </roles>
+            <timezone>+5</timezone>
+        </contributor>
+    </contributors>
+    <dependencies/>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/gbuild/trunk/</url>
+    </scm>
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+    <modules>
+        <module>modules/ejb</module>
+        <module>modules/web</module>
+        <module>modules/streamer</module>
+        <module>modules/wsappclient</module>
+        <module>modules/ear</module>
+    </modules>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>geronimo</groupId>
+                <artifactId>daytrader-wsappclient</artifactId>
+                <version>1.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>geronimo</groupId>
+                <artifactId>daytrader-streamer</artifactId>
+                <version>1.1-SNAPSHOT</version>
+            </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>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.1</version>
+            </dependency>
+            <dependency>
+                <groupId>geronimo</groupId>
+                <artifactId>daytrader-ejb</artifactId>
+                <version>${daytraderVersion}</version>
+                <type>ejb</type>
+            </dependency>
+            <!--dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-ejb</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <type>ejb-client</type>
+        </dependency-->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-web</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</dependencyManagement>
+<profiles>
+
     <profile>
-      <id>test</id>
-      <modules>
-        <module>functional-tests</module>
-      </modules>
+        <id>db2</id>
+        <activation>
+            <activeByDefault>true</activeByDefault>
+            <property>
+                <name>database</name>
+                <value>db2</value>
+            </property>
+        </activation>
+        <properties>
+            <jboss.mapping>DB2</jboss.mapping>
+        </properties>
     </profile>
-  </profiles>
+
+    <profile>
+        <id>mysql</id>
+        <activation>
+            <property>
+                <name>database</name>
+                <value>mysql</value>
+            </property>
+        </activation>
+        <properties>
+            <jboss.mapping>mySQL</jboss.mapping>
+        </properties>
+    </profile>
+
+    <profile>
+        <id>test</id>
+        <modules>
+            <module>functional-tests</module>
+        </modules>
+    </profile>
+</profiles>
 </project>