You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/01/19 10:19:14 UTC
svn commit: r900706 - in /geronimo/daytrader/trunk: ./ plugins/
plugins/daytrader-db2-datasource/ plugins/daytrader-derby-datasource/
plugins/daytrader-informix-datasource/ plugins/daytrader-mysql-datasource/
plugins/daytrader-oracle-datasource/ plugin...
Author: delos
Date: Tue Jan 19 09:19:13 2010
New Revision: 900706
URL: http://svn.apache.org/viewvc?rev=900706&view=rev
Log:
Daytrader-72 patch from Forrest
Modified:
geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml
geronimo/daytrader/trunk/plugins/pom.xml
geronimo/daytrader/trunk/pom.xml
Modified: geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml?rev=900706&r1=900705&r2=900706&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml Tue Jan 19 09:19:13 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
- <version>2.2</version>
+ <version>2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geronimo.daytrader.plugins</groupId>
@@ -58,16 +58,17 @@
<version>${geronimoVersion}</version>
<scope>provided</scope>
</dependency>
+ <!--You need to install the jdbc driver into local maven repo by self-->
<dependency>
<groupId>com.ibm.db2</groupId>
<artifactId>db2jcc</artifactId>
- <version>9.0</version>
+ <version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.ibm.db2</groupId>
<artifactId>db2jcc_license_cu</artifactId>
- <version>9.0</version>
+ <version>9.7</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -110,7 +111,7 @@
</commonInstance>
<instance>
<plugin-artifact>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${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>
Modified: geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml?rev=900706&r1=900705&r2=900706&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml Tue Jan 19 09:19:13 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
- <version>2.2</version>
+ <version>2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geronimo.daytrader.plugins</groupId>
Modified: geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml?rev=900706&r1=900705&r2=900706&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml Tue Jan 19 09:19:13 2010
@@ -111,7 +111,7 @@
</commonInstance>
<instance>
<plugin-artifact>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-informix-datasource/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-informix-datasource/${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>
Modified: geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml?rev=900706&r1=900705&r2=900706&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml Tue Jan 19 09:19:13 2010
@@ -57,14 +57,12 @@
<type>car</type>
<version>${geronimoVersion}</version>
<scope>provided</scope>
- </dependency>
- <!--You need to install the jdbc driver into local maven repo by self-->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.7</version>
- <type>jar</type>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.10</version>
+ </dependency>
</dependencies>
<build>
@@ -105,7 +103,7 @@
</commonInstance>
<instance>
<plugin-artifact>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-mysql-datasource/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-mysql-datasource/${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>
Modified: geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml?rev=900706&r1=900705&r2=900706&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml Tue Jan 19 09:19:13 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
- <version>2.2</version>
+ <version>2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geronimo.daytrader.plugins</groupId>
@@ -58,6 +58,7 @@
<version>${geronimoVersion}</version>
<scope>provided</scope>
</dependency>
+ <!--You need to install the jdbc driver into local maven repo by self-->
<dependency>
<groupId>oracle</groupId>
<artifactId>ojdbc14</artifactId>
@@ -103,7 +104,7 @@
</commonInstance>
<instance>
<plugin-artifact>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource/${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>
Modified: geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml?rev=900706&r1=900705&r2=900706&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml Tue Jan 19 09:19:13 2010
@@ -57,14 +57,12 @@
<type>car</type>
<version>${geronimoVersion}</version>
<scope>provided</scope>
- </dependency>
- <!--You need to install the jdbc driver into local maven repo by self-->
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-603.jdbc4</version>
- <type>jar</type>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-701.jdbc4</version>
+ </dependency>
</dependencies>
<build>
@@ -105,7 +103,7 @@
</commonInstance>
<instance>
<plugin-artifact>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-postgre-datasource/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-postgre-datasource/${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>
Modified: geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml?rev=900706&r1=900705&r2=900706&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml Tue Jan 19 09:19:13 2010
@@ -105,7 +105,7 @@
</commonInstance>
<instance>
<plugin-artifact>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${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>
Modified: geronimo/daytrader/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/pom.xml?rev=900706&r1=900705&r2=900706&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/pom.xml Tue Jan 19 09:19:13 2010
@@ -36,6 +36,10 @@
<!-- see profiles -->
<!--<module>daytrader-db2-datasource</module>-->
<!--<module>daytrader-oracle-datasource</module>-->
+ <!--<module>daytrader-mysql-datasource</module>-->
+ <!--<module>daytrader-informix-datasource</module>-->
+ <!--<module>daytrader-sqlserver-datasource</module>-->
+ <!--<module>daytrader-postgre-datasource</module>-->
<module>daytrader-web-jdbc-jetty</module>
<module>daytrader-web-jdbc-tomcat</module>
<module>daytrader-jms</module>
Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=900706&r1=900705&r2=900706&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Tue Jan 19 09:19:13 2010
@@ -34,7 +34,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>2.2</geronimoVersion>
<!-- set siteId to artifactId for any "top level" project rooting a website -->
<siteId>daytrader</siteId>
@@ -433,13 +433,37 @@
<profile>
<id>db2</id>
<modules>
- <module>daytrader-db2-datasource</module>
+ <module>plugins/daytrader-db2-datasource</module>
</modules>
</profile>
<profile>
<id>oracle</id>
<modules>
- <module>daytrader-oracle-datasource</module>
+ <module>plugins/daytrader-oracle-datasource</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>mysql</id>
+ <modules>
+ <module>plugins/daytrader-mysql-datasource</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>informix</id>
+ <modules>
+ <module>plugins/daytrader-informix-datasource</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>sqlserver</id>
+ <modules>
+ <module>plugins/daytrader-sqlserver-datasource</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>postgre</id>
+ <modules>
+ <module>plugins/daytrader-postgre-datasource</module>
</modules>
</profile>
</profiles>