Return-Path: 
 <scm-return-28379-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 50119 invoked from network); 22 May 2008 14:22:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 22 May 2008 14:22:41 -0000
Received: (qmail 25708 invoked by uid 500); 22 May 2008 14:22:36 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 25617 invoked by uid 500); 22 May 2008 14:22:36 -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 25595 invoked by uid 99); 22 May 2008 14:22:36 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2008 07:22:36 -0700
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, 22 May 2008 14:21:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 41A572388A61; Thu, 22 May 2008 07:22:10 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r659121 - in /geronimo/samples/branches/2.1: ./
 samples/CustomerService/CustomerService-jetty/src/main/plan/
 samples/CustomerService/CustomerService-tomcat/src/main/plan/
 samples/bank/bank-jetty/src/main/plan/ samples/bank/bank-tomcat/src/m...
Date: Thu, 22 May 2008 14:22:07 -0000
To: scm@geronimo.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080522142210.41A572388A61@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbohn
Date: Thu May 22 07:22:04 2008
New Revision: 659121

URL: http://svn.apache.org/viewvc?rev=659121&view=rev
Log:
merge 658996 from trunk - remove bogus partial environment elements so the c-m-p can generate correct ones.  Doesn't need explicit version property AFAICT

Modified:
    geronimo/samples/branches/2.1/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/bank/bank-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/bank/bank-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml

Modified: geronimo/samples/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/pom.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/pom.xml (original)
+++ geronimo/samples/branches/2.1/pom.xml Thu May 22 07:22:04 2008
@@ -46,7 +46,6 @@
     </scm>
 
     <properties>
-        <version>2.1-SNAPSHOT</version>
         <siteId>geronimo-samples</siteId>
         <projectName>Apache Geronimo Samples</projectName>
     </properties>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,16 +21,6 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-
    <module>
         <connector>tranql-connector-ra-1.3.rar</connector>
         <alt-dd>CustomerServicePool.xml</alt-dd>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -20,16 +20,6 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
    
    <module>
         <connector>tranql-connector-ra-1.3.rar</connector>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,16 +21,6 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-   
    <module>
       <connector>tranql-connector-ra-1.3.rar</connector>
       <alt-dd>BankPool.xml</alt-dd>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,16 +21,6 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-   
    <module>
       <connector>tranql-connector-ra-1.3.rar</connector>
       <alt-dd>BankPool.xml</alt-dd>

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,14 +21,4 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-   
 </application>

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,14 +21,4 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-   
 </application>

Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -19,16 +19,7 @@
 -->
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-        
-    <environment>
-        <moduleId>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>${pom.artifactId}</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </moduleId>
-    </environment>
-                
+
     <context-root>/dbtester</context-root>
 
 </web-app>

Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -19,16 +19,7 @@
 -->
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-        
-    <environment>
-        <moduleId>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>${pom.artifactId}</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </moduleId>
-    </environment>
-                
+
     <context-root>/dbtester</context-root>
 
 </web-app>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,16 +21,6 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-
    <module>
       <connector>tranql-connector-ra-1.3.rar</connector>
       <alt-dd>InventoryPool.xml</alt-dd>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,16 +21,6 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-   
    <module>
       <connector>tranql-connector-ra-1.3.rar</connector>
       <alt-dd>InventoryPool.xml</alt-dd>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,14 +21,4 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-   
 </application>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,14 +21,4 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-   
 </application>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,16 +21,6 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-
     <module>
        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
        <alt-dd>jms-resources.xml</alt-dd>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -21,16 +21,6 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
-
     <module>
        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
        <alt-dd>jms-resources.xml</alt-dd>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -20,16 +20,6 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
    
    <module>
       <connector>tranql-connector-ra-1.3.rar</connector>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -20,16 +20,6 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
    
    <module>
       <connector>tranql-connector-ra-1.3.rar</connector>

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -20,15 +20,5 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
    
 </application>

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -20,15 +20,5 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
    
 </application>

Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -20,15 +20,5 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
    
 </application>

Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -20,15 +20,5 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
    
 </application>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -20,16 +20,6 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
    
    <module>
       <connector>tranql-connector-ra-1.3.rar</connector>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml?rev=659121&r1=659120&r2=659121&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml Thu May 22 07:22:04 2008
@@ -20,16 +20,6 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-      <dep:moduleId>
-         <dep:groupId>${pom.groupId}</dep:groupId>
-         <dep:artifactId>${pom.artifactId}</dep:artifactId>
-         <dep:version>${version}</dep:version>
-         <dep:type>car</dep:type>
-      </dep:moduleId>
-
-   </dep:environment>
    
    <module>
       <connector>tranql-connector-ra-1.3.rar</connector>