geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r415736 - 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
Date Tue, 20 Jun 2006 17:45:20 GMT
Author: hogstrom
Date: Tue Jun 20 10:45:19 2006
New Revision: 415736

URL: http://svn.apache.org/viewvc?rev=415736&view=rev
Log:
Reformatted maven poms and updated version numbers

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?rev=415736&r1=415735&r2=415736&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Tue Jun 20 10:45:19 2006
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <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">
+         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>geronimo</groupId>
         <artifactId>daytrader</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <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>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</connection>
-        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</developerConnection>
+        <developerConnection>
+            scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ear</url>
     </scm>
     <dependencies>
@@ -45,7 +48,7 @@
             <plugin>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
-                    <displayName>DayTrader 1.1</displayName>
+                    <displayName>DayTrader 1.2</displayName>
                     <description>
                         DayTrader Stock Trading Performance Benchmark
                         Sample

Modified: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/pom.xml?rev=415736&r1=415735&r2=415736&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Tue Jun 20 10:45:19 2006
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <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">
+         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>geronimo</groupId>
         <artifactId>daytrader</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>geronimo</groupId>
@@ -18,7 +18,8 @@
     <description>Daytrader EJBs</description>
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb</connection>
-        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb</developerConnection>
+        <developerConnection>
+            scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ejb</developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ejb</url>
     </scm>
     <dependencies>

Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/pom.xml?rev=415736&r1=415735&r2=415736&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Tue Jun 20 10:45:19 2006
@@ -2,53 +2,56 @@
 
 <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
+         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>
-    <artifactId>daytrader</artifactId>
-    <version>1.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>daytrader-streamer</artifactId>
-  <name>DayTrader :: Quote Streamer</name>
-  <packaging>jar</packaging>
-  <description>Streamer Application for Day Trader</description>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/streamer</connection>
-    <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/streamer</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ear</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>daytrader-ejb</artifactId>
-      <version>1.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <class-path>dt-ejb.jar</class-path>
-            </manifestEntries>
-            <manifest>
-<!--              <addClasspath>true</addClasspath>  -->
-              <main-class>org.apache.geronimo.samples.daytrader.client.TradeClient</main-class>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>geronimo</groupId>
+        <artifactId>daytrader</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>daytrader-streamer</artifactId>
+    <name>DayTrader :: Quote Streamer</name>
+    <version>${daytraderVersion}</version>
+    <packaging>jar</packaging>
+    <description>Streamer Application for Day Trader</description>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/streamer</connection>
+        <developerConnection>
+            scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/streamer</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ear</url>
+    </scm>
+    <dependencies>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-ejb</artifactId>
+            <scope>provided</scope>
+            <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>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <class-path>dt-ejb.jar</class-path>
+                        </manifestEntries>
+                        <manifest>
+                            <main-class>org.apache.geronimo.samples.daytrader.client.TradeClient</main-class>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?rev=415736&r1=415735&r2=415736&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Tue Jun 20 10:45:19 2006
@@ -1,45 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <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>geronimo</groupId>
-		<artifactId>daytrader</artifactId>
-		<version>1.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>daytrader-web</artifactId>
-	<name>DayTrader :: Web Application</name>
-	<packaging>war</packaging>
-	<description>Daytrader Web</description>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/web</connection>
-    <developerConnection>scm:svn:http://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>geronimo</groupId>
-			<artifactId>daytrader-ejb</artifactId>
-			<scope>provided</scope>
-			<type>ejb</type>
-		</dependency>
-		<dependency>
-			<groupId>geronimo</groupId>
-			<artifactId>daytrader-wsappclient</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>geronimo</groupId>
-			<artifactId>daytrader-streamer</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-j2ee_1.4_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
+         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>geronimo</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>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/web</connection>
+        <developerConnection>
+            scm:svn:http://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>geronimo</groupId>
+            <artifactId>daytrader-ejb</artifactId>
+            <scope>provided</scope>
+            <type>ejb</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-wsappclient</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-streamer</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
@@ -49,14 +52,14 @@
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>jspc-maven-plugin</artifactId>
             <version>1.4.4</version>
-			<scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
-	</dependencies>
-	<build>
-		<plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>jspc-maven-plugin</artifactId>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>jspc</id>
@@ -68,36 +71,36 @@
                     </execution>
                 </executions>
             </plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-                  <webXml>${basedir}/target/jspweb.xml</webXml>
-					<filters>
-						<filter>
-							${basedir}/src/main/webapp/WEB-INF/classes/build.properties
-						</filter>
-					</filters>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webXml>${basedir}/target/jspweb.xml</webXml>
+                    <filters>
+                        <filter>
+                            ${basedir}/src/main/webapp/WEB-INF/classes/build.properties
+                        </filter>
+                    </filters>
                     <archive>
                         <manifestEntries>
                             <Class-Path>dt-ejb.jar streamer.jar wsappclient.jar</Class-Path>
-                        </manifestEntries> 
+                        </manifestEntries>
                     </archive>
-					
-					<resources>
-						<resource
-							implementation="org.apache.maven.model.Resource">
-							<filtering>true</filtering>
-							<directory>
-								${basedir}/src/main/webapp/WEB-INF
-							</directory>
-							<includes>
-								<include>web.xml</include>
-							</includes>
-						</resource>
-					</resources>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+
+                    <resources>
+                        <resource
+                                implementation="org.apache.maven.model.Resource">
+                            <filtering>true</filtering>
+                            <directory>
+                                ${basedir}/src/main/webapp/WEB-INF
+                            </directory>
+                            <includes>
+                                <include>web.xml</include>
+                            </includes>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/daytrader/trunk/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/pom.xml?rev=415736&r1=415735&r2=415736&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/pom.xml Tue Jun 20 10:45:19 2006
@@ -2,67 +2,70 @@
 
 <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
+         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>
-    <artifactId>daytrader</artifactId>
-    <version>1.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>daytrader-wsappclient</artifactId>
-  <name>DayTrader :: WS Application Client</name>
-  <packaging>jar</packaging>
-  <description>Client demonstrating Web Services</description>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/wsappclient</connection>
-    <developerConnection>scm:svn:http://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>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <!-- Caveat: The wsappclient module currently has a cyclic dependency on the
EJB module. Thus we are forced
-               to include a manual class-path entry pointing to the EJB module. When this
is fixed
-               remove the manifestEntries section below and this comment. -->
-          <archive>
-            <manifestEntries>
-              <class-path>dt-ejb.jar</class-path>
-            </manifestEntries>
-            <manifest>
-              <main-class>org.apache.geronimo.samples.daytrader.client.ws.ClientApp</main-class>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <!-- Caveat: Need to be replaced with axis plugin by Jesse
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>wsdl2java-maven-plugin</artifactId>
-        <configuration>
-          <packageSpace>org.apache.geronimo.samples.daytrader.client.ws</packageSpace>
-	      <serverSide>true</serverSide>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-	        <goals>
-	          <goal>generate</goal>
-  	        </goals>
-	      </execution>
-	    </executions>
-      </plugin>
-      -->
-    </plugins>
-  </build>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>geronimo</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>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/wsappclient</connection>
+        <developerConnection>
+            scm:svn:http://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>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <!-- Caveat: The wsappclient module currently has a cyclic dependency
on the EJB module. Thus we are forced
+            to include a manual class-path entry pointing to the EJB module. When this is
fixed
+            remove the manifestEntries section below and this comment. -->
+                    <archive>
+                        <manifestEntries>
+                            <class-path>dt-ejb.jar</class-path>
+                        </manifestEntries>
+                        <manifest>
+                            <main-class>org.apache.geronimo.samples.daytrader.client.ws.ClientApp</main-class>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <!-- Caveat: Need to be replaced with axis plugin by Jesse
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
+                <configuration>
+                    <packageSpace>org.apache.geronimo.samples.daytrader.client.ws</packageSpace>
+                    <serverSide>true</serverSide>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+	                    <goal>generate</goal>
+  	                </goals>
+	            </execution>
+	        </executions>
+            </plugin>
+            -->
+        </plugins>
+    </build>
 </project>

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=415736&r1=415735&r2=415736&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Tue Jun 20 10:45:19 2006
@@ -1,10 +1,15 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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>
     <groupId>geronimo</groupId>
     <artifactId>daytrader</artifactId>
     <name>DayTrader :: Performance Benchmark Sample</name>
     <packaging>pom</packaging>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
     <description>J2EE 1.4 Performance Benchmark Sample Application</description>
     <issueManagement>
         <system>jira</system>
@@ -28,7 +33,7 @@
         | daytrader module versions
         |
         -->
-        <daytraderVersion>1.1-SNAPSHOT</daytraderVersion>
+        <daytraderVersion>1.2-SNAPSHOT</daytraderVersion>
     </properties>
 
     <developers>
@@ -107,12 +112,12 @@
             <dependency>
                 <groupId>geronimo</groupId>
                 <artifactId>daytrader-wsappclient</artifactId>
-                <version>1.1-SNAPSHOT</version>
+                <version>${daytraderVersion}</version>
             </dependency>
             <dependency>
                 <groupId>geronimo</groupId>
                 <artifactId>daytrader-streamer</artifactId>
-                <version>1.1-SNAPSHOT</version>
+                <version>${daytraderVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -136,54 +141,48 @@
                 <version>${daytraderVersion}</version>
                 <type>ejb</type>
             </dependency>
-            <!--dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-ejb</artifactId>
-            <version>1.1-SNAPSHOT</version>
-            <type>ejb-client</type>
-        </dependency-->
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-web</artifactId>
-            <version>1.1-SNAPSHOT</version>
-            <type>war</type>
-        </dependency>
-    </dependencies>
-</dependencyManagement>
-<profiles>
-
-    <profile>
-        <id>db2</id>
-        <activation>
-            <activeByDefault>true</activeByDefault>
-            <property>
-                <name>database</name>
-                <value>db2</value>
-            </property>
-        </activation>
-        <properties>
-            <jboss.mapping>DB2</jboss.mapping>
-        </properties>
-    </profile>
-
-    <profile>
-        <id>mysql</id>
-        <activation>
-            <property>
-                <name>database</name>
-                <value>mysql</value>
-            </property>
-        </activation>
-        <properties>
-            <jboss.mapping>mySQL</jboss.mapping>
-        </properties>
-    </profile>
-
-    <profile>
-        <id>test</id>
-        <modules>
-            <module>functional-tests</module>
-        </modules>
-    </profile>
-</profiles>
+            <dependency>
+                <groupId>geronimo</groupId>
+                <artifactId>daytrader-web</artifactId>
+                <version>${daytraderVersion}</version>
+                <type>war</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <profiles>
+
+        <profile>
+            <id>db2</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>database</name>
+                    <value>db2</value>
+                </property>
+            </activation>
+            <properties>
+                <jboss.mapping>DB2</jboss.mapping>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>mysql</id>
+            <activation>
+                <property>
+                    <name>database</name>
+                    <value>mysql</value>
+                </property>
+            </activation>
+            <properties>
+                <jboss.mapping>mySQL</jboss.mapping>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <modules>
+                <module>functional-tests</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>



Mime
View raw message