You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/09/14 01:03:41 UTC
svn commit: r443160 - in /geronimo/daytrader/trunk: modules/ear/pom.xml
modules/ejb/pom.xml modules/streamer/pom.xml modules/web/pom.xml
modules/wsappclient/pom.xml pom.xml
Author: djencks
Date: Wed Sep 13 16:03:40 2006
New Revision: 443160
URL: http://svn.apache.org/viewvc?view=rev&rev=443160
Log:
DAYTRADER-13 Use individual spec jars. Also sneak in the ws-appclient since it works now
Modified:
geronimo/daytrader/trunk/modules/ear/pom.xml
geronimo/daytrader/trunk/modules/ejb/pom.xml
geronimo/daytrader/trunk/modules/streamer/pom.xml
geronimo/daytrader/trunk/modules/web/pom.xml
geronimo/daytrader/trunk/modules/wsappclient/pom.xml
geronimo/daytrader/trunk/pom.xml
Modified: geronimo/daytrader/trunk/modules/ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ear/pom.xml?view=diff&rev=443160&r1=443159&r2=443160
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Wed Sep 13 16:03:40 2006
@@ -5,14 +5,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>daytrader-ear</artifactId>
<name>DayTrader :: Enterprise Application</name>
- <version>${daytraderVersion}</version>
<packaging>ear</packaging>
<description>Daytrader EAR</description>
<scm>
@@ -23,24 +22,28 @@
</scm>
<dependencies>
<dependency>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
+ <version>${pom.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb</artifactId>
+ <version>${pom.version}</version>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-streamer</artifactId>
- <scope>compile</scope>
+ <version>${pom.version}</version>
+ <!--<scope>compile</scope>-->
</dependency>
<dependency>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-wsappclient</artifactId>
- <scope>compile</scope>
+ <version>${pom.version}</version>
+ <!--<scope>compile</scope>-->
</dependency>
</dependencies>
<build>
@@ -56,44 +59,29 @@
<version>1.4</version>
<modules>
<webModule>
- <groupId>
- geronimo
- </groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-web</artifactId>
<contextRoot>/daytrader</contextRoot>
<bundleFileName>web.war</bundleFileName>
</webModule>
<ejbModule>
- <groupId>
- geronimo
- </groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb</artifactId>
<bundleFileName>dt-ejb.jar</bundleFileName>
</ejbModule>
<javaModule>
- <groupId>
- geronimo
- </groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-streamer</artifactId>
- <bundleFileName>
- streamer.jar
- </bundleFileName>
+ <bundleFileName>streamer.jar</bundleFileName>
<includeInApplicationXml>
true
</includeInApplicationXml>
</javaModule>
<javaModule>
- <groupId>
- geronimo
- </groupId>
- <artifactId>
- daytrader-wsappclient
- </artifactId>
- <bundleFileName>
- wsappclient.jar
- </bundleFileName>
- <!-- <includeInApplicationXml>true</includeInApplicationXml> -->
-
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-wsappclient</artifactId>
+ <bundleFileName>wsappclient.jar</bundleFileName>
+ <includeInApplicationXml>true</includeInApplicationXml>
</javaModule>
</modules>
</configuration>
Modified: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/pom.xml?view=diff&rev=443160&r1=443159&r2=443160
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Wed Sep 13 16:03:40 2006
@@ -5,14 +5,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>geronimo</groupId>
<artifactId>daytrader-ejb</artifactId>
- <version>${daytraderVersion}</version>
<name>DayTrader :: EJBs</name>
<packaging>ejb</packaging>
<description>Daytrader EJBs</description>
@@ -24,14 +22,26 @@
</scm>
<dependencies>
<dependency>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-wsappclient</artifactId>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <scope>provided</scope>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-qname_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/pom.xml?view=diff&rev=443160&r1=443159&r2=443160
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Wed Sep 13 16:03:40 2006
@@ -6,7 +6,7 @@
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
@@ -14,7 +14,6 @@
<artifactId>daytrader-streamer</artifactId>
<name>DayTrader :: Quote Streamer</name>
- <version>${daytraderVersion}</version>
<packaging>jar</packaging>
<description>Streamer Application for Day Trader</description>
<scm>
@@ -25,16 +24,19 @@
</scm>
<dependencies>
<dependency>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb</artifactId>
<scope>provided</scope>
+ <version>${pom.version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
</dependencies>
<build>
Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?view=diff&rev=443160&r1=443159&r2=443160
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Wed Sep 13 16:03:40 2006
@@ -5,14 +5,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>daytrader-web</artifactId>
<name>DayTrader :: Web Application</name>
- <version>${daytraderVersion}</version>
<packaging>war</packaging>
<description>Daytrader Web</description>
<scm>
@@ -23,25 +22,39 @@
</scm>
<dependencies>
<dependency>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-ejb</artifactId>
+ <version>${pom.version}</version>
<scope>provided</scope>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-wsappclient</artifactId>
+ <version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader-streamer</artifactId>
+ <version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <scope>provided</scope>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Modified: geronimo/daytrader/trunk/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/pom.xml?view=diff&rev=443160&r1=443159&r2=443160
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/pom.xml Wed Sep 13 16:03:40 2006
@@ -6,14 +6,13 @@
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>daytrader-wsappclient</artifactId>
<name>DayTrader :: WS Application Client</name>
- <version>${daytraderVersion}</version>
<packaging>jar</packaging>
<description>Client demonstrating Web Services</description>
<scm>
@@ -25,9 +24,11 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-qname_1.1_spec</artifactId>
</dependency>
</dependencies>
<build>
Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?view=diff&rev=443160&r1=443159&r2=443160
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Wed Sep 13 16:03:40 2006
@@ -5,7 +5,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>
- <groupId>geronimo</groupId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>daytrader</artifactId>
<name>DayTrader :: Performance Benchmark Sample</name>
<packaging>pom</packaging>
@@ -27,14 +27,6 @@
</notifiers>
</ciManagement>
<inceptionYear>2005</inceptionYear>
- <properties>
- <!--
- |
- | daytrader module versions
- |
- -->
- <daytraderVersion>1.2-SNAPSHOT</daytraderVersion>
- </properties>
<developers>
<developer>
@@ -110,19 +102,39 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>daytrader-wsappclient</artifactId>
- <version>${daytraderVersion}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <version>[1.0,2.0)</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ <version>[1.0,2.0)</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>[1.0,2.0)</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>daytrader-streamer</artifactId>
- <version>${daytraderVersion}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-qname_1.1_spec</artifactId>
+ <version>[1.0,2.0)</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <version>[1.0,2.0)</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <version>1.0</version>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
+ <version>[1.0,2.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -134,18 +146,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>daytrader-ejb</artifactId>
- <version>${daytraderVersion}</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>daytrader-web</artifactId>
- <version>${daytraderVersion}</version>
- <type>war</type>
</dependency>
</dependencies>
</dependencyManagement>