You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/05/22 16:22:07 UTC
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...
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>