Return-Path: 
 <scm-return-28951-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 69304 invoked from network); 6 Jun 2008 21:17:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 6 Jun 2008 21:17:50 -0000
Received: (qmail 88016 invoked by uid 500); 6 Jun 2008 21:17:51 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 87959 invoked by uid 500); 6 Jun 2008 21:17:51 -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 87949 invoked by uid 99); 6 Jun 2008 21:17:51 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jun 2008 14:17:51 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jun 2008 21:16:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 97F362388A06; Fri,  6 Jun 2008 14:17:16 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r664132 - in /geronimo/samples/branches/2.1/samples: ./
 bank/bank-ejb/ customer-service/
 customer-service/customer-service-jetty/src/main/plan/
 customer-service/customer-service-tomcat/src/main/plan/
 jaxws-calculator/jaxws-calculator-war/ j...
Date: Fri, 06 Jun 2008 21:17:16 -0000
To: scm@geronimo.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080606211716.97F362388A06@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbohn
Date: Fri Jun  6 14:17:15 2008
New Revision: 664132

URL: http://svn.apache.org/viewvc?rev=664132&view=rev
Log:
update version dependencies to match geronimo 2.1 and add DB initialization for customer-service sample

Modified:
    geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml
    geronimo/samples/branches/2.1/samples/customer-service/customer-service-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/customer-service/customer-service-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/customer-service/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/pom.xml
    geronimo/samples/branches/2.1/samples/pom.xml
    geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml

Modified: geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml Fri Jun  6 14:17:15 2008
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_3.0_spec</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/samples/branches/2.1/samples/customer-service/customer-service-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer-service/customer-service-jetty/src/main/plan/plan.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer-service/customer-service-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/customer-service/customer-service-jetty/src/main/plan/plan.xml Fri Jun  6 14:17:15 2008
@@ -20,5 +20,11 @@
 
 <!-- $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">
-   
+
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+        <attribute name="testSQL">select * from customer</attribute>
+        <attribute name="path">CustomerService.sql</attribute>
+        <reference name="DataSource"><name>SampleTxDatasource</name></reference>
+    </gbean>
+
 </application>

Modified: geronimo/samples/branches/2.1/samples/customer-service/customer-service-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer-service/customer-service-tomcat/src/main/plan/plan.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer-service/customer-service-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/customer-service/customer-service-tomcat/src/main/plan/plan.xml Fri Jun  6 14:17:15 2008
@@ -21,4 +21,10 @@
 <!-- $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">
    
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+        <attribute name="testSQL">select * from customer</attribute>
+        <attribute name="path">CustomerService.sql</attribute>
+        <reference name="DataSource"><name>SampleTxDatasource</name></reference>
+    </gbean>
+
 </application>

Modified: geronimo/samples/branches/2.1/samples/customer-service/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer-service/pom.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer-service/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/customer-service/pom.xml Fri Jun  6 14:17:15 2008
@@ -50,7 +50,7 @@
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        <version>1.1</version>
+        <version>1.1.1</version>
         <type>jar</type>
         <scope>provided</scope>
     </dependency>
@@ -64,7 +64,7 @@
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jpa_3.0_spec</artifactId>
-        <version>1.1</version>
+        <version>1.1.1</version>
         <type>jar</type>
         <scope>provided</scope>
     </dependency>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml Fri Jun  6 14:17:15 2008
@@ -46,13 +46,13 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml Fri Jun  6 14:17:15 2008
@@ -47,7 +47,7 @@
                 <dependency>
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-jms_1.1_spec</artifactId>
-                        <version>1.1</version>
+                        <version>1.1.1</version>
                         <type>jar</type>
                         <scope>provided</scope>
                 </dependency>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml Fri Jun  6 14:17:15 2008
@@ -50,7 +50,7 @@
                 <dependency>
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                        <version>1.1</version>
+                        <version>1.1.1</version>
                         <type>jar</type>
                         <scope>provided</scope>
                 </dependency>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/pom.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/pom.xml Fri Jun  6 14:17:15 2008
@@ -50,7 +50,7 @@
                 <dependency>
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-jpa_3.0_spec</artifactId>
-                        <version>1.1</version>
+                        <version>1.1.1</version>
                         <type>jar</type>
                         <scope>provided</scope>
                 </dependency>
@@ -58,7 +58,7 @@
                 <dependency>
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                        <version>1.1</version>
+                        <version>1.1.1</version>
                         <type>jar</type>
                         <scope>provided</scope>
                 </dependency>

Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Fri Jun  6 14:17:15 2008
@@ -191,13 +191,11 @@
                     -->
                     <commonInstance>
                         <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <!--<geronimo-version>${geronimoVersion}</geronimo-version>-->
                             <jvm-version>1.5</jvm-version>
                             <!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>

Modified: geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml?rev=664132&r1=664131&r2=664132&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml Fri Jun  6 14:17:15 2008
@@ -34,7 +34,7 @@
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
             <type>rar</type>
-            <version>1.4</version>
+            <version>1.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>