Return-Path: 
 <scm-return-23031-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 34408 invoked from network); 27 Oct 2007 00:11:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 27 Oct 2007 00:11:17 -0000
Received: (qmail 62233 invoked by uid 500); 27 Oct 2007 00:11:04 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 62183 invoked by uid 500); 27 Oct 2007 00:11:04 -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 62172 invoked by uid 99); 27 Oct 2007 00:11:04 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Oct 2007 17:11:04 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Oct 2007 00:11:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E66491A9838; Fri, 26 Oct 2007 17:10:55 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r588812 - in /geronimo/samples/trunk/samples: ./
 CustomerService/CustomerService-war/src/main/webapp/WEB-INF/
 bank/bank-war/src/main/webapp/WEB-INF/
 dbtester/dbtester-war/src/main/webapp/WEB-INF/
 inventory/inventory-war/src/main/webapp/WEB-...
Date: Sat, 27 Oct 2007 00:10:54 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071027001055.E66491A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Fri Oct 26 17:10:52 2007
New Revision: 588812

URL: http://svn.apache.org/viewvc?rev=588812&view=rev
Log:
filter moduleIds

Modified:
    geronimo/samples/trunk/samples/CustomerService/CustomerService-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/pom.xml
    geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/CustomerService-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/CustomerService/CustomerService-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 26 17:10:52 2007
@@ -21,9 +21,9 @@
 	xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
    <environment>
       <moduleId>
-         <groupId>default</groupId>
-         <artifactId>CustomerService-web</artifactId>
-         <version>1.0</version>
+         <groupId>${pom.groupId}</groupId>
+         <artifactId>${pom.artifactId}</artifactId>
+         <version>${version}</version>
          <type>war</type>
       </moduleId>
 

Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 26 17:10:52 2007
@@ -19,10 +19,10 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
 	<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
 		<dep:moduleId>
-			<dep:groupId>org.apache.geronimo.samples</dep:groupId>
-			<dep:artifactId>BankWeb</dep:artifactId>
-			<dep:version>1.2</dep:version>
-			<dep:type>car</dep:type>
+			<dep:groupId>${pom.groupId}</dep:groupId>
+			<dep:artifactId>${pom.artifactId}</dep:artifactId>
+			<dep:version>${version}</dep:version>
+			<dep:type>war</dep:type>
 		</dep:moduleId>
 		<dep:dependencies/>
 		<dep:hidden-classes/>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 26 17:10:52 2007
@@ -22,9 +22,10 @@
         
     <environment>
         <moduleId>
-            <groupId>org.apache.geronimo.samples.dbtester</groupId>
-            <artifactId>dbtester</artifactId>
-            <version>2.0</version>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>war</type>
         </moduleId>
     </environment>
                 

Modified: geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 26 17:10:52 2007
@@ -22,9 +22,10 @@
 	
 	<environment>
 		<moduleId>
-			<groupId>org.apache.geronimo.samples</groupId>
-			<artifactId>InventoryApp</artifactId>
-			<version>2.0</version>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>${pom.artifactId}</artifactId>
+			<version>${version}</version>
+                        <type>war</type>
 		</moduleId>
 		<dependencies></dependencies>		
 	</environment>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 26 17:10:52 2007
@@ -19,13 +19,15 @@
 
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
     <dep:moduleId>
-      <dep:groupId>org.apache.geronimo.samples.jws</dep:groupId>
-      <dep:artifactId>Calculator</dep:artifactId>
-      <dep:version>2.0</dep:version>
-      <dep:type>car</dep:type>
+      <dep:groupId>${pom.groupId}</dep:groupId>
+      <dep:artifactId>${pom.artifactId}</dep:artifactId>
+      <dep:version>${version}</dep:version>
+      <dep:type>war</dep:type>
     </dep:moduleId>
   </dep:environment>
 
+ <context-root>/jaxws-calculator</context-root>
+
  <service-ref>
    <service-ref-name>services/Calculator</service-ref-name>
    <port>
@@ -33,7 +35,7 @@
       <protocol>http</protocol>
       <host>localhost</host>
       <port>8080</port>
-      <uri>/jaxws-calculator-war-2.0-SNAPSHOT/calculator</uri>
+      <uri>/jaxws-calculator/calculator</uri>
    </port>
  </service-ref>
 

Modified: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml Fri Oct 26 17:10:52 2007
@@ -37,11 +37,15 @@
 
     <description>Geronimo Samples. EAR Module</description>
 
+    <properties>
+       <geronimoVersion>2.0.1</geronimoVersion>
+    </properties>
+
     <dependencies>
          <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-ra</artifactId>
-            <version>2.0.1</version>
+            <version>${geronimoVersion}</version>
             <type>rar</type>
          </dependency>
 
@@ -72,7 +76,7 @@
                       <rarModule>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-activemq-ra</artifactId>
-                            <bundleFileName>geronimo-activemq-ra-2.0-SNAPSHOT.rar</bundleFileName>
+                            <bundleFileName>geronimo-activemq-ra-${geronimoVersion}.rar</bundleFileName>
                         </rarModule>
 
                       <ejbModule>

Modified: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml Fri Oct 26 17:10:52 2007
@@ -30,7 +30,7 @@
         </moduleId>
     </environment>
     <module>
-       <connector>geronimo-activemq-ra-2.0-SNAPSHOT.rar</connector>
+       <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
             <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <dep:moduleId>

Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 26 17:10:52 2007
@@ -20,10 +20,10 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">
   <sys:environment>
     <sys:moduleId>
-      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
-      <sys:artifactId>MyPhonebookWeb</sys:artifactId>
-      <sys:version>1.0</sys:version>
-      <sys:type>car</sys:type>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>war</sys:type>
     </sys:moduleId>
   </sys:environment>
   <context-root>/myphonebook</context-root>

Modified: geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 26 17:10:52 2007
@@ -18,10 +18,10 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">
   <sys:environment>
     <sys:moduleId>
-      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
-      <sys:artifactId>MyTimeWeb</sys:artifactId>
-      <sys:version>1.0</sys:version>
-      <sys:type>car</sys:type>
+      <sys:groupId>${pom.groupId}</sys:groupId>
+      <sys:artifactId>${pom.artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>war</sys:type>
     </sys:moduleId>
   </sys:environment>
   <context-root>/mytime</context-root>

Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Fri Oct 26 17:10:52 2007
@@ -95,6 +95,14 @@
                             <!-- Do not include META-INF/maven to avoid long file problems on windows -->
                             <addMavenDescriptor>false</addMavenDescriptor>
                         </archive>
+
+                        <webResources>
+                            <resource>
+                                <directory>${pom.basedir}/src/main/webapp/WEB-INF</directory>
+                                <targetPath>WEB-INF</targetPath>
+                                <filtering>true</filtering>
+                            </resource>             
+                        </webResources>
                     </configuration>
                 </plugin>
 

Modified: geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 26 17:10:52 2007
@@ -20,10 +20,10 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
     <environment>
         <moduleId>
-            <groupId>test</groupId>
-            <artifactId>sendmail</artifactId>
-            <version>1.0</version>
-            <type>car</type>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>war</type>
         </moduleId>   
         <dependencies>
             <dependency>

Modified: geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=588812&r1=588811&r2=588812&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 26 17:10:52 2007
@@ -22,9 +22,10 @@
         
         <environment>
                 <moduleId>
-                        <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>TimeReportApp</artifactId>
-                        <version>1.2</version>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>${pom.artifactId}</artifactId>
+                        <version>${version}</version> 
+                        <type>war</type>
                 </moduleId>             
         </environment>