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/11/11 09:41:21 UTC
svn commit: r1033837 [1/2] - in /geronimo/daytrader/trunk: ./ assemblies/
assemblies/javaee/ assemblies/javaee/daytrader-ear/
assemblies/javaee/daytrader-war/ assemblies/javaee/dojo-ui-ear/
assemblies/javaee/dojo-ui-war/ assemblies/web/ assemblies/web/...
Author: xiaming
Date: Thu Nov 11 08:41:20 2010
New Revision: 1033837
URL: http://svn.apache.org/viewvc?rev=1033837&view=rev
Log:
Update poms in modules and assemblies to enable compilation
Modified:
geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml
geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-ear/pom.xml
geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml
geronimo/daytrader/trunk/assemblies/javaee/pom.xml
geronimo/daytrader/trunk/assemblies/pom.xml
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml
geronimo/daytrader/trunk/assemblies/web/pom.xml
geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-ear/pom.xml
geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml
geronimo/daytrader/trunk/assemblies/webprofile/pom.xml
geronimo/daytrader/trunk/modules/beans/pom.xml
geronimo/daytrader/trunk/modules/core/pom.xml
geronimo/daytrader/trunk/modules/ejb3/pom.xml
geronimo/daytrader/trunk/modules/entities/pom.xml
geronimo/daytrader/trunk/modules/json-proxy/pom.xml
geronimo/daytrader/trunk/modules/pom.xml
geronimo/daytrader/trunk/modules/soap/pom.xml
geronimo/daytrader/trunk/modules/streamer/pom.xml
geronimo/daytrader/trunk/modules/util/pom.xml
geronimo/daytrader/trunk/modules/web/pom.xml
geronimo/daytrader/trunk/modules/wsappclient/pom.xml
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-jetty/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-jms/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/daytrader-tomcat/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/pom.xml
geronimo/daytrader/trunk/plugins/pom.xml
geronimo/daytrader/trunk/pom.xml
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,70 +19,69 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>javaee</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
-
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
+
<artifactId>daytrader-ear</artifactId>
<packaging>ear</packaging>
<name>DayTrader :: Assemblies - JavaEE EAR</name>
<description>Daytrader EAR</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-ear</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-ear</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-ear</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-war</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-entities</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb3</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-soap</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>streamer</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>wsappclient</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -98,54 +97,54 @@
<version>5</version>
<modules>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
<bundleFileName>util.jar</bundleFileName>
<includeInApplicationXml>false</includeInApplicationXml>
</javaModule>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
<bundleFileName>core.jar</bundleFileName>
<includeInApplicationXml>false</includeInApplicationXml>
</javaModule>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-entities</artifactId>
<bundleFileName>entities.jar</bundleFileName>
<includeInApplicationXml>false</includeInApplicationXml>
</javaModule>
<ejbModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb3</artifactId>
<bundleFileName>dt-ejb.jar</bundleFileName>
</ejbModule>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
<bundleFileName>web.jar</bundleFileName>
<includeInApplicationXml>false</includeInApplicationXml>
</javaModule>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-soap</artifactId>
<bundleFileName>soap.jar</bundleFileName>
<includeInApplicationXml>false</includeInApplicationXml>
</javaModule>
<webModule>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-war</artifactId>
<contextRoot>/daytrader</contextRoot>
<bundleFileName>web.war</bundleFileName>
</webModule>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>streamer</artifactId>
<bundleFileName>streamer.jar</bundleFileName>
<includeInApplicationXml>true</includeInApplicationXml>
</javaModule>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>wsappclient</artifactId>
<bundleFileName>wsappclient.jar</bundleFileName>
<includeInApplicationXml>true</includeInApplicationXml>
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,59 +19,58 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>javaee</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
-
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
+
<artifactId>daytrader-war</artifactId>
<packaging>war</packaging>
<name>DayTrader :: Assemblies - JavaEE WAR</name>
<description>Daytrader JavaEE Web Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-war</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-war</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-war</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-entities</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb3</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-soap</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
Modified: geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-ear/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-ear/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-ear/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+
<artifactId>javaee</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -33,13 +33,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+
<artifactId>dojo-ui-war</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>json-proxy</artifactId>
<version>${project.version}</version>
<type>war</type>
@@ -56,13 +56,13 @@
<version>5</version>
<modules>
<webModule>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+
<artifactId>dojo-ui-war</artifactId>
<contextRoot>/dojotrader</contextRoot>
<bundleFileName>dojo-ui.war</bundleFileName>
</webModule>
<webModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>json-proxy</artifactId>
<contextRoot>/daytraderProxy</contextRoot>
<bundleFileName>json-proxy.war</bundleFileName>
Modified: geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+
<artifactId>javaee</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
Modified: geronimo/daytrader/trunk/assemblies/javaee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/pom.xml Thu Nov 11 08:41:20 2010
@@ -20,33 +20,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>assemblies</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+
<artifactId>javaee</artifactId>
<name>DayTrader :: Assemblies for JavaEE</name>
<packaging>pom</packaging>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>daytrader-war</module>
- <module>daytrader-ear</module>
- <!--
- <module>dojo-ui-war</module>
- <module>dojo-ui-ear</module>
- -->
- </modules>
- </profile>
-
- </profiles>
+ <modules>
+ <module>daytrader-war</module>
+ <module>daytrader-ear</module>
+ <!--
+ <module>dojo-ui-war</module>
+ <module>dojo-ui-ear</module>
+ -->
+ </modules>
</project>
Modified: geronimo/daytrader/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/pom.xml Thu Nov 11 08:41:20 2010
@@ -20,29 +20,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+
<artifactId>assemblies</artifactId>
<name>DayTrader :: Assemblies</name>
<packaging>pom</packaging>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>javaee</module>
- <module>web</module>
- <module>webprofile</module>
- </modules>
- </profile>
-
- </profiles>
+ <modules>
+ <module>web</module>
+ <module>webprofile</module>
+ <module>javaee</module>
+ </modules>
</project>
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml Thu Nov 11 08:41:20 2010
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>web</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
+
<artifactId>daytrader-web-jdbc</artifactId>
<packaging>war</packaging>
<name>DayTrader :: Assemblies - Web + Direct JDBC</name>
@@ -33,22 +33,22 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-beans</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
<version>${project.version}</version>
</dependency>
@@ -73,13 +73,6 @@
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jstl</artifactId>
<scope>provided</scope>
- </dependency>
-
- <!-- test depends -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml Thu Nov 11 08:41:20 2010
@@ -20,12 +20,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>web</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jpa</artifactId>
<packaging>war</packaging>
<name>DayTrader :: Assemblies - Web + Direct JPA</name>
@@ -33,22 +32,22 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-entities</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
<version>${project.version}</version>
</dependency>
@@ -116,13 +115,6 @@
<scope>provided</scope>
</dependency>
- <!-- test depends -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- Not required for Bean version of TradeDirect
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/daytrader/trunk/assemblies/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/web/pom.xml Thu Nov 11 08:41:20 2010
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>assemblies</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+
<artifactId>web</artifactId>
<name>DayTrader :: Assemblies for Web containers</name>
<packaging>pom</packaging>
Modified: geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-ear/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-ear/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-ear/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,55 +19,55 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>webprofile</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
+
<artifactId>daytrader-webprofile-ear</artifactId>
<packaging>ear</packaging>
<name>DayTrader :: Assemblies - Web Profile EAR</name>
<description>Daytrader Web Profile EAR</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/assemblies/webprofile/daytrader-webprofile-ear</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/assemblies/webprofile/daytrader-webprofile-ear</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/assemblies/webprofile/daytrader-webprofile-ear</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-ear</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-ear</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-ear</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-war</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-entities</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb3</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -83,36 +83,36 @@
<version>5</version>
<modules>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
<bundleFileName>util.jar</bundleFileName>
<includeInApplicationXml>false</includeInApplicationXml>
</javaModule>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
<bundleFileName>core.jar</bundleFileName>
<includeInApplicationXml>false</includeInApplicationXml>
</javaModule>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-entities</artifactId>
<bundleFileName>entities.jar</bundleFileName>
<includeInApplicationXml>false</includeInApplicationXml>
</javaModule>
<ejbModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb3</artifactId>
<bundleFileName>dt-ejb.jar</bundleFileName>
</ejbModule>
<javaModule>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
<bundleFileName>web.jar</bundleFileName>
<includeInApplicationXml>false</includeInApplicationXml>
</javaModule>
<webModule>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-war</artifactId>
<contextRoot>/daytrader</contextRoot>
<bundleFileName>web.war</bundleFileName>
Modified: geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,59 +19,58 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>webprofile</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
<artifactId>daytrader-webprofile-war</artifactId>
<packaging>war</packaging>
<name>DayTrader :: Assemblies - Web Profile WAR</name>
<description>Daytrader JavaEE Web Profile Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/assemblies/webprofile/daytrader-webprofile-war</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/assemblies/webprofile/daytrader-webprofile-war</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/assemblies/webprofile/daytrader-webprofile-war</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-entities</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb3</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>ejb</type>
<scope>provided</scope>
</dependency>
<!--<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>daytrader-soap</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -114,15 +113,7 @@
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jstl</artifactId>
<scope>provided</scope>
- </dependency>
- <!-- Removed per DAYTRADER-7 due to interop issues on commercial AppServers
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jspc-maven-plugin</artifactId>
- <version>1.4.4</version>
- <scope>provided</scope>
- </dependency>
- -->
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: geronimo/daytrader/trunk/assemblies/webprofile/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/webprofile/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/webprofile/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/webprofile/pom.xml Thu Nov 11 08:41:20 2010
@@ -20,29 +20,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>assemblies</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+
<artifactId>webprofile</artifactId>
<name>DayTrader :: Assemblies for Web Profile</name>
<packaging>pom</packaging>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>daytrader-webprofile-war</module>
- <module>daytrader-webprofile-ear</module>
- </modules>
- </profile>
-
- </profiles>
-
+ <modules>
+ <module>daytrader-webprofile-war</module>
+ <module>daytrader-webprofile-ear</module>
+ </modules>
</project>
Modified: geronimo/daytrader/trunk/modules/beans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/beans/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/beans/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/beans/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,29 +19,27 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>daytrader-beans</artifactId>
<packaging>bundle</packaging>
<name>DayTrader :: Modules - Beans</name>
- <description>Daytrader UnEnhanced Enttities Module</description>
+ <description>Daytrader UnEnhanced Entities Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/beans</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/beans</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/beans</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/beans</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/beans</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/beans</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-util</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-util</artifactId>
</dependency>
<!--
<dependency>
@@ -74,12 +72,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ </dependency>
<!-- OpenJPA depends
<dependency>
<groupId>org.apache.openjpa</groupId>
Modified: geronimo/daytrader/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/core/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,41 +19,35 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>daytrader-core</artifactId>
<packaging>bundle</packaging>
<name>DayTrader :: Modules - Core</name>
<description>Daytrader Core Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/core</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/core</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/core</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/core</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/core</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/core</url>
</scm>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-util</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-beans</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-entities</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-entities</artifactId>
</dependency>
<!--
<dependency>
Modified: geronimo/daytrader/trunk/modules/ejb3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb3/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb3/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb3/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,44 +19,41 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>daytrader-ejb3</artifactId>
<packaging>ejb</packaging>
<name>DayTrader :: Modules - EJB3</name>
<description>Daytrader EJB3 Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/ejb3</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/ejb3</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/ejb3</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb3</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ejb3</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-util</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-entities</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-entities</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-core</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-core</artifactId>
</dependency>
<!--
<dependency>
<groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-wsappclient</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -84,7 +81,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
Modified: geronimo/daytrader/trunk/modules/entities/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/entities/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/entities/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/entities/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,29 +19,27 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>daytrader-entities</artifactId>
<packaging>bundle</packaging>
<name>DayTrader :: Modules - Entities</name>
<description>Daytrader JPA Enhanced Enttities Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/entities</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/entities</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/entities</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/entities</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/entities</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/entities</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -62,7 +60,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
Modified: geronimo/daytrader/trunk/modules/json-proxy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/json-proxy/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/json-proxy/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/json-proxy/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,21 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>json-proxy</artifactId>
<packaging>war</packaging>
<name>DayTrader :: Modules - JSON Proxy</name>
<description>DayTrader JSON Proxy Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/json-proxy</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/json-proxy</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/json-proxy</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/json-proxy</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/json-proxy</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/json-proxy</url>
</scm>
<dependencies>
Modified: geronimo/daytrader/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/pom.xml Thu Nov 11 08:41:20 2010
@@ -20,12 +20,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
-
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+
<artifactId>modules</artifactId>
<name>DayTrader :: Modules</name>
<packaging>pom</packaging>
Modified: geronimo/daytrader/trunk/modules/soap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/soap/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/soap/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/soap/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,43 +19,43 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>daytrader-soap</artifactId>
<name>DayTrader :: Modules - SOAP</name>
<packaging>jar</packaging>
<description>Daytrader SOAP Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/soap</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/soap</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/soap</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/soap</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/soap</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/soap</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-util</artifactId>
- <version>${pom.version}</version>
+
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-entities</artifactId>
- <version>${pom.version}</version>
+
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
- <version>${pom.version}</version>
+
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>wsappclient</artifactId>
- <version>${pom.version}</version>
+
</dependency>
<!--
<dependency>
Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,44 +19,39 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>streamer</artifactId>
<packaging>jar</packaging>
<name>DayTrader :: Modules - Quote Streamer</name>
<description>Streamer Application for Day Trader</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/streamer</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/streamer</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/streamer</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/streamer</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/streamer</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/streamer</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-util</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-core</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-entities</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-entities</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-ejb3</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-ejb3</artifactId>
<type>ejb</type>
</dependency>
Modified: geronimo/daytrader/trunk/modules/util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/util/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/util/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/util/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,21 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>daytrader-util</artifactId>
<packaging>bundle</packaging>
<name>DayTrader :: Modules - Util</name>
<description>Daytrader Util Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/util</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/util</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/util</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/util</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/util</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/util</url>
</scm>
<dependencies>
@@ -41,12 +41,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,52 +19,47 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>daytrader-web</artifactId>
<packaging>jar</packaging>
<name>DayTrader :: Modules - Web</name>
<description>Daytrader Web Module</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/web</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/web</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/web</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/web</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/web</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/web</url>
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-util</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-core</artifactId>
- <version>${pom.version}</version>
+
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-entities</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-entities</artifactId>
+
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
- <artifactId>daytrader-ejb3</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-ejb3</artifactId>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-soap</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
+
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/daytrader/trunk/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/pom.xml Thu Nov 11 08:41:20 2010
@@ -19,21 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>modules</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
+
<artifactId>wsappclient</artifactId>
<packaging>jar</packaging>
<name>DayTrader :: Modules - WS Application Client</name>
<description>Client demonstrating Web Services</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/wsappclient</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/daytrader/modules/wsappclient</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/samples/trunk/samples/daytrader/modules/wsappclient</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/wsappclient</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/wsappclient</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/wsappclient</url>
</scm>
<dependencies>
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=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
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=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
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=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
Modified: geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml Thu Nov 11 08:41:20 2010
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -36,20 +36,20 @@
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
<artifactId>daytrader-ear</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>ear</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-jms</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
Modified: geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
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=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
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=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
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=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
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=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
Modified: geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -35,20 +35,20 @@
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.assemblies.javaee</groupId>
<artifactId>daytrader-ear</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>ear</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-jms</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
@@ -202,38 +202,38 @@
<configuration>
<tasks>
<echo>Copying manually generated geronimo-plugin.xml files for app daytrader ws client</echo>
- <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-ws-client/${version}/daytrader-ws-client-${version}.car/META-INF"
+ <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-ws-client/${project.version}/daytrader-ws-client-${project.version}.car/META-INF"
failonerror="false" overwrite="true">
<fileset dir="${basedir}/../plans/wsclient" includes="geronimo-plugin.xml"/>
</copy>
<echo>Copying manually generated geronimo-plugin.xml files for app daytrader streamer client</echo>
- <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-streamer-client/${version}/daytrader-streamer-client-${version}.car/META-INF"
+ <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-streamer-client/${project.version}/daytrader-streamer-client-${project.version}.car/META-INF"
failonerror="false" overwrite="true">
<fileset dir="${basedir}/../plans/streamerclient" includes="geronimo-plugin.xml"/>
</copy>
<echo>Pack the daytrader ws client car file and install onto local repo</echo>
- <jar destfile="${project.build.directory}/daytrader-ws-client-${version}.car"
- basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-ws-client/${version}/daytrader-ws-client-${version}.car"/>
+ <jar destfile="${project.build.directory}/daytrader-ws-client-${project.version}.car"
+ basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-ws-client/${project.version}/daytrader-ws-client-${project.version}.car"/>
<condition property="mvn.exe" value="mvn.bat" else="mvn">
<os family="windows"/>
</condition>
<exec executable="${mvn.exe}">
<arg value="install:install-file"/>
- <arg value="-Dfile=${project.build.directory}/daytrader-ws-client-${version}.car"/>
+ <arg value="-Dfile=${project.build.directory}/daytrader-ws-client-${project.version}.car"/>
<arg value="-DgroupId=org.apache.geronimo.samples.daytrader.plugins"/>
<arg value="-DartifactId=daytrader-ws-client"/>
- <arg value="-Dversion=${version}"/>
+ <arg value="-Dversion=${project.version}"/>
<arg value="-Dpackaging=car"/>
<arg value="-DgeneratePom=true"/>
<arg value="-DcreateChecksum=true"/>
</exec>
<echo>Pack the daytrader streamer client car file and install onto local repo</echo>
- <jar destfile="${project.build.directory}/daytrader-streamer-client-${version}.car"
- basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-streamer-client/${version}/daytrader-streamer-client-${version}.car"/>
+ <jar destfile="${project.build.directory}/daytrader-streamer-client-${project.version}.car"
+ basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-streamer-client/${project.version}/daytrader-streamer-client-${project.version}.car"/>
<condition property="mvn.exe" value="mvn.bat" else="mvn">
@@ -241,10 +241,10 @@
</condition>
<exec executable="${mvn.exe}">
<arg value="install:install-file"/>
- <arg value="-Dfile=${project.build.directory}/daytrader-streamer-client-${version}.car"/>
+ <arg value="-Dfile=${project.build.directory}/daytrader-streamer-client-${project.version}.car"/>
<arg value="-DgroupId=org.apache.geronimo.samples.daytrader.plugins"/>
<arg value="-DartifactId=daytrader-streamer-client"/>
- <arg value="-Dversion=${version}"/>
+ <arg value="-Dversion=${project.version}"/>
<arg value="-Dpackaging=car"/>
<arg value="-DgeneratePom=true"/>
<arg value="-DcreateChecksum=true"/>
Modified: geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml?rev=1033837&r1=1033836&r2=1033837&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml Thu Nov 11 08:41:20 2010
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.samples.daytrader</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jdbc</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>