You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/04/12 07:39:33 UTC
svn commit: r933098 [2/2] - in /geronimo/samples/trunk/samples: ./
daytrader/ daytrader/assemblies/ daytrader/assemblies/javaee/
daytrader/assemblies/javaee/daytrader-ear/
daytrader/assemblies/javaee/daytrader-war/ daytrader/assemblies/web/
daytrader/a...
Modified: geronimo/samples/trunk/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml?rev=933098&r1=933081&r2=933098&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml Mon Apr 12 05:39:32 2010
@@ -18,13 +18,15 @@
<!-- $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">
- <parent>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>plugins</artifactId>
- <version>2.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <artifactId>plugins</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-sqlserver-datasource</artifactId>
<packaging>car</packaging>
<name>Daytrader :: Plugins :: Microsoft SQL Server DataSource</name>
@@ -113,12 +115,12 @@
<instance>
<plugin-artifact>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-sqlserver-datasource</artifactId>
</obsoletes>
</plugin-artifact>
Modified: geronimo/samples/trunk/samples/daytrader/plugins/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/plugins/daytrader-tomcat/pom.xml?rev=933098&r1=933081&r2=933098&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/plugins/daytrader-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/plugins/daytrader-tomcat/pom.xml Mon Apr 12 05:39:32 2010
@@ -18,33 +18,35 @@
<!-- $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>
+
<parent>
- <groupId>org.apache.geronimo.daytrader</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader</groupId>
<artifactId>plugins</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-tomcat</artifactId>
<packaging>car</packaging>
<name>Daytrader :: Plugins :: JavaEE Tomcat</name>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.daytrader.assemblies.javaee</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
<artifactId>daytrader-ear</artifactId>
<version>${version}</version>
<type>ear</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-jms</artifactId>
<version>${version}</version>
<type>car</type>
@@ -160,27 +162,27 @@
<deploymentConfig>${clientDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.daytrader.assemblies.javaee</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
<artifactId>daytrader-ear</artifactId>
<type>ear</type>
</module>
<instance>
<plugin-artifact>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-tomcat//car">org.apache.geronimo.daytrader.plugins/daytrader-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat/${pom.version}/car</artifact-alias>
</plugin-artifact>
</instance>
</configuration>
@@ -221,7 +223,7 @@
<exec executable="${mvn.exe}">
<arg value="install:install-file"/>
<arg value="-Dfile=${project.build.directory}/daytrader-ws-client-${version}.car"/>
- <arg value="-DgroupId=org.apache.geronimo.daytrader.plugins"/>
+ <arg value="-DgroupId=org.apache.geronimo.samples.daytrader.plugins"/>
<arg value="-DartifactId=daytrader-ws-client"/>
<arg value="-Dversion=${version}"/>
<arg value="-Dpackaging=car"/>
@@ -240,7 +242,7 @@
<exec executable="${mvn.exe}">
<arg value="install:install-file"/>
<arg value="-Dfile=${project.build.directory}/daytrader-streamer-client-${version}.car"/>
- <arg value="-DgroupId=org.apache.geronimo.daytrader.plugins"/>
+ <arg value="-DgroupId=org.apache.geronimo.samples.daytrader.plugins"/>
<arg value="-DartifactId=daytrader-streamer-client"/>
<arg value="-Dversion=${version}"/>
<arg value="-Dpackaging=car"/>
Modified: geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml?rev=933098&r1=933081&r2=933098&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml Mon Apr 12 05:39:32 2010
@@ -18,14 +18,15 @@
<!-- $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>
+
<parent>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>plugins</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <artifactId>plugins</artifactId>
+ <version>3.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-jetty</artifactId>
<packaging>car</packaging>
<name>Daytrader :: Plugins :: Web + Direct JDBC :: Jetty</name>
@@ -33,14 +34,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jdbc</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
<version>${version}</version>
<type>car</type>
@@ -93,27 +94,27 @@
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jdbc</artifactId>
<type>war</type>
</module>
<instance>
<plugin-artifact>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty//car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-jetty/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml?rev=933098&r1=933081&r2=933098&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml Mon Apr 12 05:39:32 2010
@@ -18,28 +18,29 @@
<!-- $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>
+
<parent>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>plugins</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <artifactId>plugins</artifactId>
+ <version>3.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-tomcat</artifactId>
<packaging>car</packaging>
<name>Daytrader :: Plugins :: Web + Direct JDBC :: Tomcat</name>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jdbc</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
<version>${version}</version>
<type>car</type>
@@ -90,27 +91,27 @@
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jdbc</artifactId>
<type>war</type>
</module>
<instance>
<plugin-artifact>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat//car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml?rev=933098&r1=933081&r2=933098&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml Mon Apr 12 05:39:32 2010
@@ -18,14 +18,15 @@
<!-- $Rev: 813223 $ $Date: 2009-09-10 00:19:29 -0400 (Thu, 10 Sep 2009) $ -->
<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.daytrader</groupId>
- <artifactId>plugins</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <artifactId>plugins</artifactId>
+ <version>3.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-jetty</artifactId>
<packaging>car</packaging>
<name>Daytrader :: Plugins :: Web + JPA :: Jetty</name>
@@ -33,14 +34,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jpa</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
<version>${version}</version>
<type>car</type>
@@ -93,27 +94,27 @@
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jpa</artifactId>
<type>war</type>
</module>
<instance>
<plugin-artifact>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty//car">org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-jetty/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml?rev=933098&r1=933081&r2=933098&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml Mon Apr 12 05:39:32 2010
@@ -18,28 +18,29 @@
<!-- $Rev: 907731 $ $Date: 2010-02-08 12:22:43 -0500 (Mon, 08 Feb 2010) $ -->
<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.daytrader</groupId>
- <artifactId>plugins</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <artifactId>plugins</artifactId>
+ <version>3.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-tomcat</artifactId>
<packaging>car</packaging>
<name>Daytrader :: Plugins :: Web + Direct JPA :: Tomcat</name>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jpa</artifactId>
<version>${version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
<version>${version}</version>
<type>car</type>
@@ -90,27 +91,27 @@
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
- <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jpa</artifactId>
<type>war</type>
</module>
<instance>
<plugin-artifact>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-tomcat//car">org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car</artifact-alias>
<obsoletes>
- <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car</artifact-alias>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/samples/trunk/samples/daytrader/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/plugins/pom.xml?rev=933098&r1=933081&r2=933098&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/plugins/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/plugins/pom.xml Mon Apr 12 05:39:32 2010
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.daytrader</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader</groupId>
<artifactId>daytrader-parent</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.daytrader</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader</groupId>
<artifactId>plugins</artifactId>
<name>DayTrader :: Plugins</name>
<packaging>pom</packaging>
@@ -41,9 +41,9 @@
</activation>
<modules>
<module>daytrader-derby-datasource</module>
- <module>daytrader-web-jdbc-jetty</module>
+ <module>daytrader-web-jdbc-jetty</module>
<module>daytrader-web-jdbc-tomcat</module>
- <module>daytrader-web-jpa-jetty</module>
+ <module>daytrader-web-jpa-jetty</module>
<module>daytrader-web-jpa-tomcat</module>
<module>daytrader-jms</module>
<module>daytrader-jetty</module>
@@ -68,13 +68,13 @@
<module>daytrader-derby-datasource</module>
<module>daytrader-db2-datasource</module>
<module>daytrader-oracle-datasource</module>
- <module>daytrader-mysql-datasource</module>
+ <module>daytrader-mysql-datasource</module>
<module>daytrader-informix-datasource</module>
- <module>daytrader-sqlserver-datasource</module>
+ <module>daytrader-sqlserver-datasource</module>
<module>daytrader-postgre-datasource</module>
- <module>daytrader-web-jdbc-jetty</module>
+ <module>daytrader-web-jdbc-jetty</module>
<module>daytrader-web-jdbc-tomcat</module>
- <module>daytrader-web-jpa-jetty</module>
+ <module>daytrader-web-jpa-jetty</module>
<module>daytrader-web-jpa-tomcat</module>
<module>daytrader-jms</module>
<module>daytrader-jetty</module>
@@ -129,8 +129,8 @@
</deploymentConfigs>
<commonInstance>
<plugin-artifact>
- <geronimo-version>2.2</geronimo-version>
- <geronimo-version>2.2.1-SNAPSHOT</geronimo-version>
+ <!--<geronimo-version>2.2</geronimo-version>
+ <geronimo-version>2.2.1-SNAPSHOT</geronimo-version>-->
<jvm-version>1.5</jvm-version>
<jvm-version>1.6</jvm-version>
<source-repository>~/.m2/repository/</source-repository>
@@ -139,51 +139,7 @@
</plugin-artifact>
</commonInstance>
</configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <!-- Allow any Java >= 1.5 -->
- <requireJavaVersion>
- <version>[1.5,)</version>
- </requireJavaVersion>
-
- <!-- Allow any Maven >= 2.0.9 -->
- <requireMavenVersion>
- <version>[2.0.9,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
Modified: geronimo/samples/trunk/samples/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/pom.xml?rev=933098&r1=933081&r2=933098&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/pom.xml Mon Apr 12 05:39:32 2010
@@ -20,20 +20,27 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis</groupId>
- <artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>samples</artifactId>
+ <version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.daytrader</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader</groupId>
<artifactId>daytrader-parent</artifactId>
<name>DayTrader :: Performance Benchmark Sample</name>
<packaging>pom</packaging>
- <version>2.2-SNAPSHOT</version>
+
<description>Java EE 5.0 Performance Benchmark Sample Application</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader</url>
+ </scm>
+
<properties>
- <!-- This property is required by the car:package mojo -->
+ <!-- This property is required by the car:package mojo, inherited from samples' root pom -->
+ <!--Crack: Use 2.2 to test if plugins is compilable and workable -->
<geronimoVersion>2.2</geronimoVersion>
<!-- set siteId to artifactId for any "top level" project rooting a website -->
@@ -53,6 +60,9 @@
<jetty7Deployer>org.apache.geronimo.configs/jetty7-deployer/${geronimoVersion}/car</jetty7Deployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
+
+ <openjpaVersion>1.2.2</openjpaVersion>
+ <geronimoJavaEE5Version>2.2</geronimoJavaEE5Version>
</properties>
<issueManagement>
@@ -130,25 +140,13 @@
</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/daytrader/trunk/</url>
- </scm>
+
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
- <modules>
- <!-- Daytrader application -->
- <module>modules</module>
- <!-- Installable assemblies -->
- <module>assemblies</module>
- <!-- Geronimo c-m-p built plugins -->
- <module>plugins</module>
-
- </modules>
+
<dependencyManagement>
<dependencies>
@@ -156,18 +154,10 @@
<dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${geronimoJavaEE5Version}</version>
<type>pom</type>
<scope>import</scope>
- </dependency>
- <!-- Import ActiveMQ dependency versions -->
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq</artifactId>
- <version>${geronimoVersion}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -219,175 +209,11 @@
<category>Daytrader</category>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <version>${geronimoVersion}</version>
-
- <configuration>
- <assemblies>
- <assembly>
- <id>jetty</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-jetty7-javaee5</artifactId>
- <version>${geronimoVersion}</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
-
- <assembly>
- <id>jetty-minimal</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-jetty7-minimal</artifactId>
- <version>${geronimoVersion}</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
-
- <assembly>
- <id>tomcat</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-tomcat6-javaee5</artifactId>
- <version>${geronimoVersion}</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
-
- <assembly>
- <id>tomcat-minimal</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-tomcat6-minimal</artifactId>
- <version>${geronimoVersion}</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
-
- <assembly>
- <id>framework</id>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-framework</artifactId>
- <version>${geronimoVersion}</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </assembly>
- </assemblies>
-
- <defaultAssemblyId>framework</defaultAssemblyId>
-
- <optionSets>
- <optionSet>
- <id>morememory</id>
- <options>
- <option>-Xmx512m</option>
- <option>-XX:MaxPermSize=128m</option>
- </options>
- </optionSet>
-
- <optionSet>
- <id>debug</id>
- <options>
- <option>-Xdebug</option>
- <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
- </options>
- </optionSet>
- </optionSets>
- </configuration>
- <executions>
- <execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <assemblyId>${it-server}</assemblyId>
- <logOutput>true</logOutput>
- <background>true</background>
- <verifyTimeout>300</verifyTimeout>
- <refresh>true</refresh>
- <optionSets>
- <optionSet>
- <id>default</id>
- <options>
- <option>-XX:MaxPermSize=128m</option>
- </options>
- </optionSet>
-
- <optionSet>
- <id>morememory</id>
- <options>
- <option>-Xmx512m</option>
- <option>-XX:MaxPermSize=128m</option>
- </options>
- </optionSet>
-
- <optionSet>
- <id>debug</id>
- <options>
- <option>-Xdebug</option>
- <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
- </options>
- </optionSet>
- </optionSets>
- </configuration>
- </execution>
- <execution>
- <id>install-plugin</id>
- <phase>install</phase>
- <goals>
- <goal>install-plugin</goal>
- </goals>
- <!--<configuration>-->
- <!--<defaultGeronimoRepository>http://geronimo.apache.org/plugins/geronimo-${geronimoVersion}/</defaultGeronimoRepository>-->
- <!--</configuration>-->
- </execution>
- <execution>
- <id>stop</id>
- <phase>install</phase>
- <goals>
- <goal>stop-server</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <!-- Allow any Java >= 1.5 -->
- <requireJavaVersion>
- <version>[1.5,)</version>
- </requireJavaVersion>
-
- <!-- Allow any Maven >= 2.0.9 -->
- <requireMavenVersion>
- <version>[2.0.9,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -401,40 +227,43 @@
</plugins>
</build>
- <!--
- Remove this once the genesis 2.0.1 is released or there is a better solution
- -->
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<profiles>
<profile>
- <id>jboss-db2</id>
+ <id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
- <property>
- <name>database</name>
- <value>db2</value>
- </property>
</activation>
<properties>
<jboss.mapping>DB2</jboss.mapping>
</properties>
+ <modules>
+ <!-- Daytrader application -->
+ <module>modules</module>
+ <!-- Installable assemblies -->
+ <module>assemblies</module>
+ <!-- Geronimo c-m-p built plugins -->
+ <module>plugins</module>
+ </modules>
</profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <properties>
+ <jboss.mapping>DB2</jboss.mapping>
+ </properties>
+ <modules>
+ <!-- Daytrader application -->
+ <module>modules</module>
+ <!-- Installable assemblies -->
+ <module>assemblies</module>
+ </modules>
+ </profile>
<profile>
<id>jboss-mysql</id>
@@ -448,14 +277,7 @@
<jboss.mapping>mySQL</jboss.mapping>
</properties>
</profile>
-
- <profile>
- <id>test</id>
- <modules>
- <module>functional-tests</module>
- </modules>
- </profile>
-
+
<profile>
<id>db2</id>
<modules>
@@ -468,25 +290,25 @@
<module>plugins/daytrader-oracle-datasource</module>
</modules>
</profile>
- <profile>
+ <profile>
<id>mysql</id>
<modules>
<module>plugins/daytrader-mysql-datasource</module>
</modules>
</profile>
- <profile>
+ <profile>
<id>informix</id>
<modules>
<module>plugins/daytrader-informix-datasource</module>
</modules>
</profile>
- <profile>
+ <profile>
<id>sqlserver</id>
<modules>
<module>plugins/daytrader-sqlserver-datasource</module>
</modules>
</profile>
- <profile>
+ <profile>
<id>postgre</id>
<modules>
<module>plugins/daytrader-postgre-datasource</module>
Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=933098&r1=933097&r2=933098&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Mon Apr 12 05:39:32 2010
@@ -210,7 +210,7 @@
<module>javaee5</module>
<module>javaee6</module>
<module>osgi</module>
- <!--<module>daytrader</module>-->
+ <module>daytrader</module>
</modules>
</profile>
</profiles>