You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2010/04/27 22:23:15 UTC
svn commit: r938634 - in /geronimo/daytrader/branches/2.1.3: README
daytrader-db2-datasource/pom.xml daytrader-derby-datasource/pom.xml
daytrader-jetty/pom.xml daytrader-jms/pom.xml
daytrader-oracle-datasource/pom.xml daytrader-tomcat/pom.xml pom.xml
Author: dwoods
Date: Tue Apr 27 20:23:15 2010
New Revision: 938634
URL: http://svn.apache.org/viewvc?rev=938634&view=rev
Log:
updates to support 2.1.5 and 2.1.6-SNAPSHOT servers
Modified:
geronimo/daytrader/branches/2.1.3/README
geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml
geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml
geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml
geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml
geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml
geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml
geronimo/daytrader/branches/2.1.3/pom.xml
Modified: geronimo/daytrader/branches/2.1.3/README
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/README?rev=938634&r1=938633&r2=938634&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/README (original)
+++ geronimo/daytrader/branches/2.1.3/README Tue Apr 27 20:23:15 2010
@@ -22,6 +22,9 @@ and daytrader-tomcat plugins.
-------------
| INSTALL |
-------------
+You can install Daytrader either as a set of Geronimo Plugins or as an EAR.
+Both methods support using either the comand-line deployer or the Admin Console.
+
Plug-ins
--------
@@ -117,6 +120,10 @@ Deployer
1. Access the dayTrader application at:
http://<hostname>:<port>/daytrader.
2. Before you begin using DayTraader, theres are a couple setup steps:
+ - If you used one of the provided database deployment plans to create the
+ TradeDataSource, then you will need to create the required tables and
+ indexes in the database (one-time setup) by selecting:
+ 'Configuration -> (Re)-create DayTrader Database Tables and Indexes'
- Populate the database with a set of fictional users, stocks, prices, etc.
by selecting:
'Configuration -> (Re)-populate Trade Database'.
Modified: geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml?rev=938634&r1=938633&r2=938634&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml Tue Apr 27 20:23:15 2010
@@ -17,18 +17,42 @@
-->
<!-- $Rev$ $Date$ -->
-<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>
<artifactId>daytrader</artifactId>
<groupId>org.apache.geronimo.daytrader</groupId>
<version>2.1.3</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-db2-datasource</artifactId>
<packaging>car</packaging>
<name>Daytrader :: DB2 DataSource</name>
+ <!--
+ You must either manually install the DB2 files into your local repo
+ or provide a URL to a repo that hosts them either on the cmdline
+ or in your .m2/settings.xml file:
+ -Ddb2.maven.repo=http://maven.yourco.nowhere/
+ Optionally, you can override the default DB2 groupId, artifactIds
+ and version by also supplying the following properties:
+ -Ddb2.groupid=com.ibm.db2
+ -Ddb2.driver.artifactid=db2jcc
+ -Ddb2.license.artifactid=db2_license_cu
+ -Ddb2.version=9.5
+ -->
+ <properties>
+ <db2.maven.repo>http://not.a.real.repository</db2.maven.repo>
+ <db2.groupid>com.ibm.db2</db2.groupid>
+ <db2.driver.artifactid>db2jcc</db2.driver.artifactid>
+ <db2.license.artifactid>db2jcc_license_cu</db2.license.artifactid>
+ <db2.version>9.5</db2.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.tranql</groupId>
@@ -59,20 +83,37 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.ibm.db2</groupId>
- <artifactId>db2jcc</artifactId>
- <version>9.0</version>
+ <groupId>${db2.groupid}</groupId>
+ <artifactId>${db2.driver.artifactid}</artifactId>
+ <version>${db2.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.ibm.db2</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>9.0</version>
+ <groupId>${db2.groupid}</groupId>
+ <artifactId>${db2.license.artifactid}</artifactId>
+ <version>${db2.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>db2.repository</id>
+ <name>DB2 Repository</name>
+ <url>${db2.maven.repo}</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
@@ -87,8 +128,8 @@
</archive>
<osiApproved>true</osiApproved>
<useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
+ <value>false</value>
+ <includeVersion>false</includeVersion>
</useMavenDependencies>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
@@ -100,25 +141,22 @@
<artifactId>tranql-connector-db2-xa</artifactId>
<type>rar</type>
</module>
- <commonInstance>
- <plugin-artifact>
- <geronimo-version>${geronimoVersion}</geronimo-version>
- <geronimo-version>2.1.4</geronimo-version>
- <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
- <jvm-version>1.5</jvm-version>
- <jvm-version>1.6</jvm-version>
- <source-repository>~/.m2/repository/</source-repository>
- <source-repository>http://repo1.maven.org/maven2/</source-repository>
- </plugin-artifact>
- </commonInstance>
<instance>
<plugin-artifact>
- <artifact-alias key="org.apache.geronimo.daytrader/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader/daytrader-db2-database/${version}/car</artifact-alias>
- <!-- The following doesn't work with c-m-p in 2.1.3
- <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
- <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
- <obsoletes>org.apache.geronimo.daytrader/daytrader-db2-datasource//car</obsoletes>
- -->
+ <artifact-alias key="org.apache.geronimo.daytrader/daytrader-derby-database/${project.version}/car">org.apache.geronimo.daytrader/daytrader-db2-database/${project.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.daytrader/daytrader-oracle-database/${project.version}/car">org.apache.geronimo.daytrader/daytrader-db2-database/${project.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-db2-datasource</artifactId>
+ </obsoletes>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-derby-datasource</artifactId>
+ </obsoletes>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-oracle-datasource</artifactId>
+ </obsoletes>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml?rev=938634&r1=938633&r2=938634&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml Tue Apr 27 20:23:15 2010
@@ -17,13 +17,17 @@
-->
<!-- $Rev$ $Date$ -->
-<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>
<artifactId>daytrader</artifactId>
<groupId>org.apache.geronimo.daytrader</groupId>
<version>2.1.3</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
<packaging>car</packaging>
@@ -78,10 +82,6 @@
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
<osiApproved>true</osiApproved>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
@@ -92,23 +92,22 @@
<artifactId>tranql-connector-derby-embed-xa</artifactId>
<type>rar</type>
</module>
- <commonInstance>
- <plugin-artifact>
- <geronimo-version>${geronimoVersion}</geronimo-version>
- <geronimo-version>2.1.4</geronimo-version>
- <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
- <jvm-version>1.5</jvm-version>
- <jvm-version>1.6</jvm-version>
- <source-repository>~/.m2/repository/</source-repository>
- <source-repository>http://repo1.maven.org/maven2/</source-repository>
- </plugin-artifact>
- </commonInstance>
<instance>
<plugin-artifact>
- <!-- The following doesn't work with c-m-p in 2.1.3
- <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
- <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
- -->
+ <artifact-alias key="org.apache.geronimo.daytrader/daytrader-db2-database/${project.version}/car">org.apache.geronimo.daytrader/daytrader-derby-database/${project.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.daytrader/daytrader-oracle-database/${project.version}/car">org.apache.geronimo.daytrader/daytrader-derby-database/${project.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-db2-datasource</artifactId>
+ </obsoletes>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-derby-datasource</artifactId>
+ </obsoletes>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-oracle-datasource</artifactId>
+ </obsoletes>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml?rev=938634&r1=938633&r2=938634&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml Tue Apr 27 20:23:15 2010
@@ -17,19 +17,22 @@
-->
<!-- $Rev$ $Date$ -->
-<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>
<artifactId>daytrader</artifactId>
<groupId>org.apache.geronimo.daytrader</groupId>
<version>2.1.3</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-jetty</artifactId>
<packaging>car</packaging>
<name>Daytrader :: Jetty</name>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.daytrader</groupId>
@@ -141,7 +144,6 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
</dependency>
-
</dependencies>
<build>
@@ -176,29 +178,23 @@
<artifactId>daytrader-ear</artifactId>
<type>ear</type>
</module>
- <commonInstance>
- <plugin-artifact>
- <geronimo-version>${geronimoVersion}</geronimo-version>
- <geronimo-version>2.1.4</geronimo-version>
- <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
- <jvm-version>1.5</jvm-version>
- <jvm-version>1.6</jvm-version>
- <source-repository>~/.m2/repository/</source-repository>
- <source-repository>http://repo1.maven.org/maven2/</source-repository>
- </plugin-artifact>
- </commonInstance>
<instance>
<plugin-artifact>
- <!-- The following doesn't work with c-m-p in 2.1.3
- <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
- <obsoletes>org.apache.geronimo.daytrader/daytrader-jetty//car</obsoletes>
- -->
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader</artifactId>
+ </obsoletes>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-jetty</artifactId>
+ </obsoletes>
</plugin-artifact>
</instance>
</configuration>
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>it</id>
Modified: geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml?rev=938634&r1=938633&r2=938634&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml Tue Apr 27 20:23:15 2010
@@ -17,6 +17,7 @@
-->
<!-- $Rev$ $Date$ -->
+
<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>
@@ -74,6 +75,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -101,23 +103,16 @@
<artifactId>geronimo-activemq-ra</artifactId>
<type>rar</type>
</module>
- <commonInstance>
- <plugin-artifact>
- <geronimo-version>${geronimoVersion}</geronimo-version>
- <geronimo-version>2.1.4</geronimo-version>
- <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
- <jvm-version>1.5</jvm-version>
- <jvm-version>1.6</jvm-version>
- <source-repository>~/.m2/repository/</source-repository>
- <source-repository>http://repo1.maven.org/maven2/</source-repository>
- </plugin-artifact>
- </commonInstance>
<instance>
<plugin-artifact>
- <!-- The following doesn't work with c-m-p in 2.1.3
- <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
- <obsoletes>org.apache.geronimo.daytrader/daytrader-jms//car</obsoletes>
- -->
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader</artifactId>
+ </obsoletes>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-jms</artifactId>
+ </obsoletes>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml?rev=938634&r1=938633&r2=938634&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml Tue Apr 27 20:23:15 2010
@@ -17,18 +17,40 @@
-->
<!-- $Rev$ $Date$ -->
-<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>
<artifactId>daytrader</artifactId>
<groupId>org.apache.geronimo.daytrader</groupId>
<version>2.1.3</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-oracle-datasource</artifactId>
<packaging>car</packaging>
<name>Daytrader :: Oracle DataSource</name>
+ <!--
+ You must either manually install the Oracle files into your local repo
+ or provide a URL to a repo that hosts them either on the cmdline
+ or in your .m2/settings.xml file:
+ -Doracle.maven.repo=http://maven.yourco.nowhere/
+ Optionally, you can override the default Oracle groupId, artifactIds
+ and version by also supplying the following properties:
+ -Doracle.groupid=com.oracle
+ -Doracle.driver.artifactid=ojdbc14
+ -Doracle.version=10.2
+ -->
+ <properties>
+ <oracle.maven.repo>http://not.a.real.repository</oracle.maven.repo>
+ <oracle.groupid>com.oracle</oracle.groupid>
+ <oracle.driver.artifactid>ojdbc14</oracle.driver.artifactid>
+ <oracle.version>10.2</oracle.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.tranql</groupId>
@@ -59,13 +81,30 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>oracle</groupId>
+ <groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
- <version>10g</version>
+ <version>${oracle.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>oracle.repository</id>
+ <name>Oracle Repository</name>
+ <url>${oracle.maven.repo}</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
@@ -93,25 +132,22 @@
<artifactId>tranql-connector-oracle-xa</artifactId>
<type>rar</type>
</module>
- <commonInstance>
- <plugin-artifact>
- <geronimo-version>${geronimoVersion}</geronimo-version>
- <geronimo-version>2.1.4</geronimo-version>
- <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
- <jvm-version>1.5</jvm-version>
- <jvm-version>1.6</jvm-version>
- <source-repository>~/.m2/repository/</source-repository>
- <source-repository>http://repo1.maven.org/maven2/</source-repository>
- </plugin-artifact>
- </commonInstance>
<instance>
<plugin-artifact>
- <artifact-alias key="org.apache.geronimo.daytrader/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader/daytrader-oracle-database/${version}/car</artifact-alias>
- <!-- The following doesn't work with c-m-p in 2.1.3
- <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
- <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
- <obsoletes>org.apache.geronimo.daytrader/daytrader-oracle-datasource//car</obsoletes>
- -->
+ <artifact-alias key="org.apache.geronimo.daytrader/daytrader-db2-database/${project.version}/car">org.apache.geronimo.daytrader/daytrader-oracle-database/${project.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.daytrader/daytrader-derby-database/${project.version}/car">org.apache.geronimo.daytrader/daytrader-oracle-database/${project.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-db2-datasource</artifactId>
+ </obsoletes>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-derby-datasource</artifactId>
+ </obsoletes>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-oracle-datasource</artifactId>
+ </obsoletes>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml?rev=938634&r1=938633&r2=938634&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml Tue Apr 27 20:23:15 2010
@@ -17,13 +17,17 @@
-->
<!-- $Rev$ $Date$ -->
-<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>
<artifactId>daytrader</artifactId>
<groupId>org.apache.geronimo.daytrader</groupId>
<version>2.1.3</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-tomcat</artifactId>
<packaging>car</packaging>
@@ -140,8 +144,8 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
</dependency>
-
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -174,23 +178,16 @@
<artifactId>daytrader-ear</artifactId>
<type>ear</type>
</module>
- <commonInstance>
- <plugin-artifact>
- <geronimo-version>${geronimoVersion}</geronimo-version>
- <geronimo-version>2.1.4</geronimo-version>
- <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
- <jvm-version>1.5</jvm-version>
- <jvm-version>1.6</jvm-version>
- <source-repository>~/.m2/repository/</source-repository>
- <source-repository>http://repo1.maven.org/maven2/</source-repository>
- </plugin-artifact>
- </commonInstance>
<instance>
<plugin-artifact>
- <!-- The following doesn't work with c-m-p in 2.1.3
- <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
- <obsoletes>org.apache.geronimo.daytrader/daytrader-tomcat//car</obsoletes>
- -->
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader</artifactId>
+ </obsoletes>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-tomcat</artifactId>
+ </obsoletes>
</plugin-artifact>
</instance>
</configuration>
@@ -264,6 +261,7 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>it</id>
Modified: geronimo/daytrader/branches/2.1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/pom.xml?rev=938634&r1=938633&r2=938634&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/pom.xml Tue Apr 27 20:23:15 2010
@@ -27,9 +27,9 @@
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader</artifactId>
- <name>DayTrader :: Performance Benchmark Sample</name>
<packaging>pom</packaging>
<version>2.1.3</version>
+ <name>DayTrader :: Performance Benchmark Sample</name>
<description>Java EE 5.0 Performance Benchmark Sample Application</description>
<properties>
@@ -220,13 +220,34 @@
<extensions>true</extensions>
<configuration>
<category>Daytrader</category>
+ <archive>
+ <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <osiApproved>true</osiApproved>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ <commonInstance>
+ <plugin-artifact>
+ <geronimo-version>${geronimoVersion}</geronimo-version>
+ <geronimo-version>2.1.3</geronimo-version>
+ <geronimo-version>2.1.4</geronimo-version>
+ <geronimo-version>2.1.5</geronimo-version>
+ <geronimo-version>2.1.6-SNAPSHOT</geronimo-version>
+ <jvm-version>1.5</jvm-version>
+ <jvm-version>1.6</jvm-version>
+ <source-repository>~/.m2/repository/</source-repository>
+ <source-repository>http://repo1.maven.org/maven2/</source-repository>
+ </plugin-artifact>
+ </commonInstance>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
<version>${geronimoVersion}</version>
-
<configuration>
<assemblies>
<assembly>