geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r588764 - in /geronimo/samples/trunk/samples: ./ CustomerService/ CustomerService/CustomerService-ear/ CustomerService/CustomerService-ear/src/main/resources/META-INF/ CustomerService/CustomerService-war/ bank/ bank/bank-ear/ bank/bank-ear/...
Date Fri, 26 Oct 2007 20:06:03 GMT
Author: gawor
Date: Fri Oct 26 13:06:00 2007
New Revision: 588764

URL: http://svn.apache.org/viewvc?rev=588764&view=rev
Log:
reduce hardcoded version references

Modified:
    geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml
    geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/CustomerService/CustomerService-war/pom.xml
    geronimo/samples/trunk/samples/CustomerService/pom.xml
    geronimo/samples/trunk/samples/bank/bank-ear/pom.xml
    geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/bank/bank-war/pom.xml
    geronimo/samples/trunk/samples/bank/pom.xml
    geronimo/samples/trunk/samples/calculator-stateless-pojo/pom.xml
    geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml
    geronimo/samples/trunk/samples/dbtester/pom.xml
    geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml
    geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/inventory/inventory-war/pom.xml
    geronimo/samples/trunk/samples/inventory/pom.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
    geronimo/samples/trunk/samples/jaxws-calculator/pom.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/jms-mdb-sample/jms-mdb-sample-war/pom.xml
    geronimo/samples/trunk/samples/jms-mdb-sample/pom.xml
    geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml
    geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/myphonebook/myphonebook-war/pom.xml
    geronimo/samples/trunk/samples/myphonebook/pom.xml
    geronimo/samples/trunk/samples/mytime/mytime-ear/pom.xml
    geronimo/samples/trunk/samples/mytime/mytime-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/mytime/mytime-war/pom.xml
    geronimo/samples/trunk/samples/mytime/pom.xml
    geronimo/samples/trunk/samples/pom.xml
    geronimo/samples/trunk/samples/sendmail/pom.xml
    geronimo/samples/trunk/samples/sendmail/sendmail-ear/pom.xml
    geronimo/samples/trunk/samples/sendmail/sendmail-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/sendmail/sendmail-war/pom.xml
    geronimo/samples/trunk/samples/timereport/pom.xml
    geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml
    geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/timereport/timereport-war/pom.xml

Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml Fri Oct 26 13:06:00 2007
@@ -48,14 +48,14 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>CustomerService-war</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>CustomerService-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ejb</type>
         </dependency>
     </dependencies>
@@ -72,14 +72,14 @@
                       <ejbModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>CustomerService-ejb</artifactId>
-                            <bundleFileName>CustomerService-ejb-2.0-SNAPSHOT.jar</bundleFileName>
+                            <bundleFileName>CustomerService-ejb-${version}.jar</bundleFileName>
                         </ejbModule>
 
                         <webModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>CustomerService-war</artifactId>
                             <contextRoot>/CustomerService</contextRoot>
-                            <bundleFileName>CustomerService-war-2.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>CustomerService-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml Fri Oct 26 13:06:00 2007
@@ -18,9 +18,9 @@
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
       <dep:moduleId>
-         <dep:groupId>default</dep:groupId>
-         <dep:artifactId>CustomerService</dep:artifactId>
-         <dep:version>1.0</dep:version>
+         <dep:groupId>${pom.groupId}</dep:groupId>
+         <dep:artifactId>${pom.artifactId}</dep:artifactId>
+         <dep:version>${version}</dep:version>
          <dep:type>ear</dep:type>
       </dep:moduleId>
 

Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/CustomerService-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/CustomerService/CustomerService-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>CustomerService-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -61,7 +61,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>

Modified: geronimo/samples/trunk/samples/CustomerService/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/pom.xml (original)
+++ geronimo/samples/trunk/samples/CustomerService/pom.xml Fri Oct 26 13:06:00 2007
@@ -81,21 +81,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

Modified: geronimo/samples/trunk/samples/bank/bank-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-ear/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-ear/pom.xml Fri Oct 26 13:06:00 2007
@@ -38,24 +38,24 @@
     <description>Geronimo Samples. EAR Module</description>
 
     <dependencies>
-		<dependency>
-			<groupId>org.tranql</groupId>
-			<artifactId>tranql-connector-ra</artifactId>
-			<version>1.3</version>
-			<type>rar</type>
-		</dependency>
-		
-		<dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-ra</artifactId>
+            <version>1.3</version>
+            <type>rar</type>
+        </dependency>
+                
+        <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>bank-war</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>bank-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ejb</type>
         </dependency>
     </dependencies>
@@ -72,14 +72,14 @@
                       <ejbModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>bank-ejb</artifactId>
-                            <bundleFileName>bank-ejb-2.0-SNAPSHOT.jar</bundleFileName>
+                            <bundleFileName>bank-ejb-${version}.jar</bundleFileName>
                         </ejbModule>
 
                         <webModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>bank-war</artifactId>
                             <contextRoot>/bank</contextRoot>
-                            <bundleFileName>bank-war-2.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>bank-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/META-INF/geronimo-application.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/META-INF/geronimo-application.xml Fri Oct 26 13:06:00 2007
@@ -26,7 +26,7 @@
         <moduleId>
             <groupId>${pom.groupId}</groupId>
             <artifactId>${pom.artifactId}</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </moduleId>
     </environment>

Modified: geronimo/samples/trunk/samples/bank/bank-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>bank-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -61,7 +61,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>

Modified: geronimo/samples/trunk/samples/bank/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/pom.xml Fri Oct 26 13:06:00 2007
@@ -75,21 +75,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/pom.xml Fri Oct 26 13:06:00 2007
@@ -54,21 +54,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
 </project>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -79,7 +79,7 @@
                         <configuration>
                             <tasks>
                                 <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>

Modified: geronimo/samples/trunk/samples/dbtester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/pom.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/pom.xml Fri Oct 26 13:06:00 2007
@@ -56,21 +56,4 @@
        </plugins>
    </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

Modified: geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml Fri Oct 26 13:06:00 2007
@@ -38,16 +38,16 @@
     <description>Geronimo Samples. EAR Module</description>
 
     <dependencies>
-		<dependency>
-			<groupId>org.tranql</groupId>
-			<artifactId>tranql-connector-ra</artifactId>
-			<version>1.3</version>
-			<type>rar</type>
-		</dependency>
-		<dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-ra</artifactId>
+            <version>1.3</version>
+            <type>rar</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>inventory-war</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
     </dependencies>
@@ -65,7 +65,7 @@
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>inventory-war</artifactId>
                             <contextRoot>/inventory</contextRoot>
-                            <bundleFileName>inventory-war-2.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>inventory-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/META-INF/geronimo-application.xml Fri Oct 26 13:06:00 2007
@@ -26,7 +26,7 @@
         <dep:moduleId>
             <dep:groupId>${pom.groupId}</dep:groupId>
             <dep:artifactId>${pom.artifactId}</dep:artifactId>
-            <dep:version>2.0-SNAPSHOT</dep:version>
+            <dep:version>${version}</dep:version>
             <dep:type>ear</dep:type>
         </dep:moduleId>
     </dep:environment>

Modified: geronimo/samples/trunk/samples/inventory/inventory-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -52,7 +52,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>

Modified: geronimo/samples/trunk/samples/inventory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/pom.xml Fri Oct 26 13:06:00 2007
@@ -56,21 +56,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml Fri Oct 26 13:06:00 2007
@@ -41,14 +41,14 @@
       <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jaxws-calculator-war</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jaxws-calculator-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ejb</type>
         </dependency>
     </dependencies>
@@ -65,14 +65,14 @@
                       <ejbModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>jaxws-calculator-ejb</artifactId>
-                            <bundleFileName>jaxws-calculator-ejb-2.0-SNAPSHOT.jar</bundleFileName>
+                            <bundleFileName>jaxws-calculator-ejb-${version}.jar</bundleFileName>
                         </ejbModule>
 
                         <webModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>jaxws-calculator-war</artifactId>
                             <contextRoot>/jaxws-calculator</contextRoot>
-                            <bundleFileName>jaxws-calculator-war-2.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>jaxws-calculator-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/src/main/resources/META-INF/geronimo-application.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/src/main/resources/META-INF/geronimo-application.xml Fri Oct 26 13:06:00 2007
@@ -26,7 +26,7 @@
         <moduleId>
             <groupId>${pom.groupId}</groupId>
             <artifactId>${pom.artifactId}</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </moduleId>
     </environment>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -37,27 +37,6 @@
 
     <description>Geronimo Samples. WEB Module</description>
 
-    <repositories>
-        <!--
-        NOTE: The default repositories are picked up by Genesis, but need to
-              specify where Genesis lives to pick it up  any additional repositories.        -->
-        
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.axis2</groupId>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/pom.xml Fri Oct 26 13:06:00 2007
@@ -57,21 +57,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

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=588764&r1=588763&r2=588764&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 13:06:00 2007
@@ -48,14 +48,14 @@
          <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jms-mdb-sample-war</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jms-mdb-sample-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ejb</type>
         </dependency>
     </dependencies>
@@ -78,14 +78,14 @@
                       <ejbModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>jms-mdb-sample-ejb</artifactId>
-                            <bundleFileName>jms-mdb-sample-ejb-2.0-SNAPSHOT.jar</bundleFileName>
+                            <bundleFileName>jms-mdb-sample-ejb-${version}.jar</bundleFileName>
                         </ejbModule>
 
                         <webModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>jms-mdb-sample-war</artifactId>
                             <contextRoot>/order</contextRoot>
-                            <bundleFileName>jms-mdb-sample-war-2.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>jms-mdb-sample-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

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=588764&r1=588763&r2=588764&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 13:06:00 2007
@@ -25,7 +25,7 @@
         <moduleId>
             <groupId>${pom.groupId}</groupId>
             <artifactId>${pom.artifactId}</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </moduleId>
     </environment>
@@ -34,9 +34,9 @@
         <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>
-                    <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+                    <dep:groupId>${pom.groupId}</dep:groupId>
                     <dep:artifactId>jms-resources</dep:artifactId>
-                    <dep:version>1.2</dep:version>
+                    <dep:version>${version}</dep:version>
                     <dep:type>rar</dep:type>
                 </dep:moduleId>
                 <dep:dependencies>

Modified: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jms-mdb-sample-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -61,7 +61,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>

Modified: geronimo/samples/trunk/samples/jms-mdb-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/pom.xml Fri Oct 26 13:06:00 2007
@@ -55,23 +55,6 @@
                 </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
     <build>
         <plugins>
             <plugin>

Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml Fri Oct 26 13:06:00 2007
@@ -48,14 +48,14 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>myphonebook-war</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>myphonebook-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ejb</type>
         </dependency>
     </dependencies>
@@ -72,14 +72,14 @@
                       <ejbModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>myphonebook-ejb</artifactId>
-                            <bundleFileName>myphonebook-ejb-2.0-SNAPSHOT.jar</bundleFileName>
+                            <bundleFileName>myphonebook-ejb-${version}.jar</bundleFileName>
                         </ejbModule>
 
                         <webModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>myphonebook-war</artifactId>
                             <contextRoot>/myphonebook</contextRoot>
-                            <bundleFileName>myphonebook-war-2.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>myphonebook-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml Fri Oct 26 13:06:00 2007
@@ -23,10 +23,10 @@
 				application-name="t6">
   <sys:environment>
     <sys:moduleId>
-      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
-      <sys:artifactId>MyPhonebook</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>ear</sys:type>
     </sys:moduleId>
   </sys:environment>
 

Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>myphonebook-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -61,7 +61,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>

Modified: geronimo/samples/trunk/samples/myphonebook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/pom.xml Fri Oct 26 13:06:00 2007
@@ -75,21 +75,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

Modified: geronimo/samples/trunk/samples/mytime/mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-ear/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-ear/pom.xml Fri Oct 26 13:06:00 2007
@@ -41,14 +41,14 @@
       <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>mytime-war</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>mytime-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ejb</type>
         </dependency>
     </dependencies>
@@ -65,14 +65,14 @@
                       <ejbModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>mytime-ejb</artifactId>
-                            <bundleFileName>mytime-ejb-2.0-SNAPSHOT.jar</bundleFileName>
+                            <bundleFileName>mytime-ejb-${version}.jar</bundleFileName>
                         </ejbModule>
 
                         <webModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>mytime-war</artifactId>
                             <contextRoot>/mytime</contextRoot>
-                            <bundleFileName>mytime-war-2.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>mytime-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/samples/trunk/samples/mytime/mytime-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-ear/src/main/resources/META-INF/geronimo-application.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-ear/src/main/resources/META-INF/geronimo-application.xml Fri Oct 26 13:06:00 2007
@@ -26,7 +26,7 @@
         <moduleId>
             <groupId>${pom.groupId}</groupId>
             <artifactId>${pom.artifactId}</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </moduleId>
     </environment>

Modified: geronimo/samples/trunk/samples/mytime/mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>mytime-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -61,7 +61,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>

Modified: geronimo/samples/trunk/samples/mytime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/pom.xml Fri Oct 26 13:06:00 2007
@@ -57,21 +57,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Fri Oct 26 13:06:00 2007
@@ -48,13 +48,15 @@
         <module>mytime</module>
         <module>sendmail</module>
         <module>timereport</module>
+        <module>jsp-examples</module>
+        <module>servlet-examples</module>
     </modules>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -66,7 +68,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/samples/trunk/samples/sendmail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/pom.xml Fri Oct 26 13:06:00 2007
@@ -56,21 +56,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

Modified: geronimo/samples/trunk/samples/sendmail/sendmail-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-ear/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-ear/pom.xml Fri Oct 26 13:06:00 2007
@@ -41,7 +41,7 @@
       <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>sendmail-war</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
     </dependencies>
@@ -59,7 +59,7 @@
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>sendmail-war</artifactId>
                             <contextRoot>/sendmail</contextRoot>
-                            <bundleFileName>sendmail-war-2.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>sendmail-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/samples/trunk/samples/sendmail/sendmail-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-ear/src/main/resources/META-INF/geronimo-application.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-ear/src/main/resources/META-INF/geronimo-application.xml Fri Oct 26 13:06:00 2007
@@ -26,7 +26,7 @@
         <moduleId>
             <groupId>${pom.groupId}</groupId>
             <artifactId>${pom.artifactId}</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </moduleId>
     </environment>

Modified: geronimo/samples/trunk/samples/sendmail/sendmail-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -55,7 +55,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>

Modified: geronimo/samples/trunk/samples/timereport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/pom.xml Fri Oct 26 13:06:00 2007
@@ -56,21 +56,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories> 
-
 </project>

Modified: geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml Fri Oct 26 13:06:00 2007
@@ -38,16 +38,17 @@
     <description>Geronimo Samples. EAR Module</description>
 
     <dependencies>
-		<dependency>
-			<groupId>org.tranql</groupId>
-			<artifactId>tranql-connector-ra</artifactId>
-			<version>1.3</version>
-			<type>rar</type>
-		</dependency>
-		<dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-ra</artifactId>
+            <version>1.3</version>
+            <type>rar</type>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>timereport-war</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
     </dependencies>
@@ -65,7 +66,7 @@
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>timereport-war</artifactId>
                             <contextRoot>/timereport</contextRoot>
-                            <bundleFileName>timereport-war-2.0-SNAPSHOT.war</bundleFileName>
+                            <bundleFileName>timereport-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/META-INF/geronimo-application.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/META-INF/geronimo-application.xml Fri Oct 26 13:06:00 2007
@@ -26,7 +26,7 @@
         <moduleId>
             <groupId>${pom.groupId}</groupId>
             <artifactId>${pom.artifactId}</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </moduleId>
     </environment>

Modified: geronimo/samples/trunk/samples/timereport/timereport-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-war/pom.xml?rev=588764&r1=588763&r2=588764&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-war/pom.xml Fri Oct 26 13:06:00 2007
@@ -55,7 +55,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-2.0-SNAPSHOT" failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>



Mime
View raw message