Return-Path: 
 <scm-return-44686-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 54091 invoked from network); 25 Nov 2010 09:41:44 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 25 Nov 2010 09:41:44 -0000
Received: (qmail 75947 invoked by uid 500); 25 Nov 2010 06:55:03 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 75838 invoked by uid 500); 25 Nov 2010 06:55:03 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 75831 invoked by uid 99); 25 Nov 2010 06:55:02 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Nov 2010 06:55:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Nov 2010 06:54:57 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8456A23888EA; Thu, 25 Nov 2010 06:53:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1038938 - in /geronimo/daytrader/branches/2.1/plans: ./
 src/
 src/main/ src/main/resources/ src/main/resources/streamerclient/
 src/main/resources/wsclient/ streamerclient/ wsclient/
Date: Thu, 25 Nov 2010 06:53:22 -0000
To: scm@geronimo.apache.org
From: xiaming@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101125065322.8456A23888EA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: xiaming
Date: Thu Nov 25 06:53:20 2010
New Revision: 1038938

URL: http://svn.apache.org/viewvc?rev=1038938&view=rev
Log:
Tunr plans into a project so that filter version number automatically

Added:
    geronimo/daytrader/branches/2.1/plans/pom.xml   (with props)
    geronimo/daytrader/branches/2.1/plans/src/
    geronimo/daytrader/branches/2.1/plans/src/main/
    geronimo/daytrader/branches/2.1/plans/src/main/resources/
    geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-db2-xa-plan.xml
      - copied, changed from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-db2-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-derby-xa-plan.xml
      - copied, changed from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-derby-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-informix-xa-plan.xml
      - copied, changed from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-informix-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-mysql-xa-plan.xml
      - copied, changed from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-mysql-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-oracle-xa-plan.xml
      - copied, changed from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-oracle-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-postgre-xa-plan.xml
      - copied, changed from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-postgre-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-plan.xml
      - copied, changed from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-plan.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml
      - copied, changed from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/dojo-ui-plan.xml
      - copied, changed from r1038927, geronimo/daytrader/branches/2.1/plans/dojo-ui-plan.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/streamerclient/
      - copied from r1038927, geronimo/daytrader/branches/2.1/plans/streamerclient/
    geronimo/daytrader/branches/2.1/plans/src/main/resources/wsclient/
      - copied from r1038927, geronimo/daytrader/branches/2.1/plans/wsclient/
Removed:
    geronimo/daytrader/branches/2.1/plans/daytrader-db2-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/daytrader-derby-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/daytrader-informix-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/daytrader-mysql-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/daytrader-oracle-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/daytrader-postgre-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-plan.xml
    geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-xa-plan.xml
    geronimo/daytrader/branches/2.1/plans/dojo-ui-plan.xml
    geronimo/daytrader/branches/2.1/plans/streamerclient/
    geronimo/daytrader/branches/2.1/plans/wsclient/
Modified:
    geronimo/daytrader/branches/2.1/plans/src/main/resources/streamerclient/geronimo-plugin.xml
    geronimo/daytrader/branches/2.1/plans/src/main/resources/wsclient/geronimo-plugin.xml

Added: geronimo/daytrader/branches/2.1/plans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/pom.xml?rev=1038938&view=auto
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/pom.xml (added)
+++ geronimo/daytrader/branches/2.1/plans/pom.xml Thu Nov 25 06:53:20 2010
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 680611 $ $Date: 2008-07-28 23:08:37 -0400 (Mon, 28 Jul 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>daytrader</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>plans</artifactId>
+    <name>Daytrader plans</name>
+    <packaging>jar</packaging>
+
+    <description>
+        Contain all of daytrader geronimo deployment plans
+    </description>    
+
+    <!--<dependencies>                
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>jasper-el</artifactId>
+        </dependency>
+    </dependencies>-->
+
+    <build>
+    	<!-- this cause mvn eclipse:eclipse failure on windows platform -->
+    	<resources>
+        	<resource>
+                <directory>
+                    ${basedir}/src/main/resources
+                </directory>                
+                <filtering>true</filtering>                            
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>                
+        </resources>
+        <!--<plugins>            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>                    
+                    <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>
+                    </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>                    
+                    <webResources>
+                        <resource>
+                            <directory>${project.build.outputDirectory}</directory>
+                            <includes>
+                                <include>META-INF/LICENSE*</include>
+                                <include>META-INF/NOTICE*</include>
+                                <include>META-INF/DISCLAIMER*</include>
+                            </includes>
+                        </resource>
+                        <resource>
+                            <directory>${basedir}/src/main/resources</directory>                            
+                            <targetPath>docs</targetPath>
+                            <filtering>true</filtering>                            
+                            <includes>
+                                <include>**/tradeversion.html</include>
+                            </includes>
+                        </resource>                             
+                    </webResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <configuration>
+                  <format>{0,date,yyyy/MM/dd}</format>
+                  <items>
+                    <item>timestamp</item>
+                  </items>
+                </configuration>
+                <executions>
+                  <execution>
+                    <phase>validate</phase>
+                    <goals>
+                      <goal>create</goal>
+                    </goals>
+                  </execution>
+                </executions>
+             </plugin>
+        </plugins>-->
+    </build>
+
+</project>

Propchange: geronimo/daytrader/branches/2.1/plans/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-db2-xa-plan.xml (from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-db2-xa-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-db2-xa-plan.xml?p2=geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-db2-xa-plan.xml&p1=geronimo/daytrader/branches/2.1/plans/daytrader-db2-xa-plan.xml&r1=1038927&r2=1038938&rev=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/daytrader-db2-xa-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-db2-xa-plan.xml Thu Nov 25 06:53:20 2010
@@ -23,7 +23,7 @@
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.1.3</version>
+            <version>${project.version}</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -48,13 +48,13 @@
             <dependency>
                 <groupId>com.ibm.db2</groupId>
                 <artifactId>db2jcc</artifactId>
-                <version>9.1</version>
+                <version>8.2</version>
                 <type>jar</type>
             </dependency>
             <dependency>
                 <groupId>com.ibm.db2</groupId>
                 <artifactId>db2jcc_license_cu</artifactId>
-                <version>9.1</version>
+                <version>8.2</version>
                 <type>jar</type>
             </dependency>
         </dependencies>
@@ -134,7 +134,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -142,7 +142,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -207,7 +207,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -215,7 +215,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -240,7 +240,7 @@
                             <name>jdbc/TradeDataSource</name>
                             <config-property-setting name="UserName">trade</config-property-setting>
                             <config-property-setting name="Password">trade</config-property-setting>
-                            <config-property-setting name="PortNumber">50001</config-property-setting>
+                            <config-property-setting name="PortNumber">50000</config-property-setting>
                             <config-property-setting name="ServerName">localhost</config-property-setting>
                             <config-property-setting name="DatabaseName">tradedb</config-property-setting>
                             <config-property-setting name="DriverType">4</config-property-setting>
@@ -261,7 +261,7 @@
                             <name>jdbc/NoTxTradeDataSource</name>
                             <config-property-setting name="UserName">trade</config-property-setting>
                             <config-property-setting name="Password">trade</config-property-setting>
-                            <config-property-setting name="PortNumber">50001</config-property-setting>
+                            <config-property-setting name="PortNumber">50000</config-property-setting>
                             <config-property-setting name="ServerName">localhost</config-property-setting>
                             <config-property-setting name="DatabaseName">tradedb</config-property-setting>
                             <config-property-setting name="DriverType">4</config-property-setting>

Copied: geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-derby-xa-plan.xml (from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-derby-xa-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-derby-xa-plan.xml?p2=geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-derby-xa-plan.xml&p1=geronimo/daytrader/branches/2.1/plans/daytrader-derby-xa-plan.xml&r1=1038927&r2=1038938&rev=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/daytrader-derby-xa-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-derby-xa-plan.xml Thu Nov 25 06:53:20 2010
@@ -23,7 +23,7 @@
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.1.7</version>
+            <version>${project.version}</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -126,7 +126,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.1.7</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -134,7 +134,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.1.7</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -197,7 +197,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.1.7</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -205,7 +205,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.1.7</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Copied: geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-informix-xa-plan.xml (from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-informix-xa-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-informix-xa-plan.xml?p2=geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-informix-xa-plan.xml&p1=geronimo/daytrader/branches/2.1/plans/daytrader-informix-xa-plan.xml&r1=1038927&r2=1038938&rev=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/daytrader-informix-xa-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-informix-xa-plan.xml Thu Nov 25 06:53:20 2010
@@ -21,7 +21,7 @@
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${project.version}</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -131,7 +131,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -139,7 +139,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -204,7 +204,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -212,7 +212,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Copied: geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-mysql-xa-plan.xml (from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-mysql-xa-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-mysql-xa-plan.xml?p2=geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-mysql-xa-plan.xml&p1=geronimo/daytrader/branches/2.1/plans/daytrader-mysql-xa-plan.xml&r1=1038927&r2=1038938&rev=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/daytrader-mysql-xa-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-mysql-xa-plan.xml Thu Nov 25 06:53:20 2010
@@ -21,7 +21,7 @@
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${project.version}</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -125,7 +125,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -133,7 +133,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -198,7 +198,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -206,7 +206,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Copied: geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-oracle-xa-plan.xml (from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-oracle-xa-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-oracle-xa-plan.xml?p2=geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-oracle-xa-plan.xml&p1=geronimo/daytrader/branches/2.1/plans/daytrader-oracle-xa-plan.xml&r1=1038927&r2=1038938&rev=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/daytrader-oracle-xa-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-oracle-xa-plan.xml Thu Nov 25 06:53:20 2010
@@ -23,7 +23,7 @@
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.1.3</version>
+            <version>${project.version}</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -128,7 +128,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -136,7 +136,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -201,7 +201,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -209,7 +209,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Copied: geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-postgre-xa-plan.xml (from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-postgre-xa-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-postgre-xa-plan.xml?p2=geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-postgre-xa-plan.xml&p1=geronimo/daytrader/branches/2.1/plans/daytrader-postgre-xa-plan.xml&r1=1038927&r2=1038938&rev=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/daytrader-postgre-xa-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-postgre-xa-plan.xml Thu Nov 25 06:53:20 2010
@@ -23,7 +23,7 @@
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${project.version}</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -124,7 +124,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -132,7 +132,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -197,7 +197,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -205,7 +205,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Copied: geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-plan.xml (from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-plan.xml?p2=geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-plan.xml&p1=geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-plan.xml&r1=1038927&r2=1038938&rev=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-plan.xml Thu Nov 25 06:53:20 2010
@@ -23,7 +23,7 @@
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.1.3</version>
+            <version>${project.version}</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -128,7 +128,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -136,7 +136,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -201,7 +201,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -209,7 +209,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.1.3</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Copied: geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml (from r1038927, geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-xa-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml?p2=geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml&p1=geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-xa-plan.xml&r1=1038927&r2=1038938&rev=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/daytrader-sqlserver-xa-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml Thu Nov 25 06:53:20 2010
@@ -21,7 +21,7 @@
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${project.version}</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -126,7 +126,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -134,7 +134,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -199,7 +199,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -207,7 +207,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.1.1.2</version>
+                    <version>${project.version}</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Copied: geronimo/daytrader/branches/2.1/plans/src/main/resources/dojo-ui-plan.xml (from r1038927, geronimo/daytrader/branches/2.1/plans/dojo-ui-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/dojo-ui-plan.xml?p2=geronimo/daytrader/branches/2.1/plans/src/main/resources/dojo-ui-plan.xml&p1=geronimo/daytrader/branches/2.1/plans/dojo-ui-plan.xml&r1=1038927&r2=1038938&rev=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/dojo-ui-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/dojo-ui-plan.xml Thu Nov 25 06:53:20 2010
@@ -23,7 +23,7 @@
     <dep:moduleId>
       <dep:groupId>geronimo</dep:groupId>
       <dep:artifactId>daytrader-dojo</dep:artifactId>
-      <dep:version>1.1</dep:version>
+      <dep:version>${project.version}</dep:version>
       <dep:type>car</dep:type>
     </dep:moduleId>
     <dep:dependencies>

Modified: geronimo/daytrader/branches/2.1/plans/src/main/resources/streamerclient/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/streamerclient/geronimo-plugin.xml?rev=1038938&r1=1038927&r2=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/src/main/resources/streamerclient/geronimo-plugin.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/streamerclient/geronimo-plugin.xml Thu Nov 25 06:53:20 2010
@@ -29,16 +29,16 @@
         <module-id>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader-streamer-client</artifactId>
-            <version>2.1.3</version>
+            <version>${project.version}</version>
             <type>car</type>
         </module-id>
-        <geronimo-version>2.1.3</geronimo-version>
+        <!--<geronimo-version>${geronimoVersion}</geronimo-version>-->
         <jvm-version>1.5</jvm-version>
         <jvm-version>1.6</jvm-version>
         <dependency start="false">
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
-            <version>2.1.3</version>
+            <!--<version>${geronimoVersion}</version>-->
             <type>car</type>
         </dependency>
         <config-xml-content load="false"/>

Modified: geronimo/daytrader/branches/2.1/plans/src/main/resources/wsclient/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/src/main/resources/wsclient/geronimo-plugin.xml?rev=1038938&r1=1038927&r2=1038938&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/src/main/resources/wsclient/geronimo-plugin.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/src/main/resources/wsclient/geronimo-plugin.xml Thu Nov 25 06:53:20 2010
@@ -29,22 +29,22 @@
         <module-id>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader-ws-client</artifactId>
-            <version>2.1.3</version>
+            <version>${project.version}</version>
             <type>car</type>
         </module-id>
-        <geronimo-version>2.1.3</geronimo-version>
+        <!--<geronimo-version>${geronimoVersion}</geronimo-version>-->
         <jvm-version>1.5</jvm-version>
         <jvm-version>1.6</jvm-version>
         <dependency start="true">
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
-            <version>2.1.3</version>
+            <!--<version>${geronimoVersion}</version>-->
             <type>car</type>
         </dependency>
         <dependency start="true">
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis</artifactId>
-            <version>2.1.3</version>
+            <!--<version>${geronimoVersion}</version>-->
             <type>car</type>
         </dependency>