Return-Path: 
 <scm-return-43358-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 7182 invoked from network); 25 Jun 2010 06:35:25 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 25 Jun 2010 06:35:25 -0000
Received: (qmail 29391 invoked by uid 500); 25 Jun 2010 06:35:24 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 29343 invoked by uid 500); 25 Jun 2010 06:35:24 -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 29336 invoked by uid 99); 25 Jun 2010 06:35:24 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jun 2010 06:35:24 +0000
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, 25 Jun 2010 06:35:12 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 875E32388C10; Fri, 25 Jun 2010 06:33:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r957816 [10/12] - in /geronimo/samples/branches/3.0-M1:
 ./
 samples/ samples/all-samples/all-samples-jetty/
 samples/all-samples/all-samples-tomcat/ samples/daytrader/
 samples/daytrader/assemblies/ samples/daytrader/assemblies/javaee/ samples...
Date: Fri, 25 Jun 2010 06:33:49 -0000
To: scm@geronimo.apache.org
From: xiaming@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100625063353.875E32388C10@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-client/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-client/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-client/pom.xml Fri Jun 25 06:33:41 2010
@@ -38,8 +38,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.geronimo.ext.openejb</groupId>
             <artifactId>openejb-client</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
@@ -48,7 +49,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -87,7 +87,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -153,7 +153,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -21,11 +21,11 @@
 <!-- $Rev$ $Date$ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <!--<attribute name="testSQL">select * from customer</attribute>-->
         <attribute name="path">CustomerService.sql</attribute>
         <reference name="DataSource">
-            <name>SampleTxDatasource</name>
+            <name>SampleNoTxDatasource</name>
         </reference>
     </gbean>
 

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -87,13 +87,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6</artifactId>
             <version>${geronimoVersion}</version>
@@ -105,7 +105,7 @@
             <artifactId>jasper</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -21,11 +21,11 @@
 <!-- $Rev$ $Date$ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <!--<attribute name="testSQL">select * from customer</attribute>-->
         <attribute name="path">CustomerService.sql</attribute>
         <reference name="DataSource">
-            <name>SampleTxDatasource</name>
+            <name>SampleNoTxDatasource</name>
         </reference>
     </gbean>
 

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/customer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/customer/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/customer/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/customer/pom.xml Fri Jun 25 06:33:41 2010
@@ -41,12 +41,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -81,5 +81,17 @@
                 <module>customer-client</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>customer-ejb</module>
+                <module>customer-war</module>
+                <module>customer-ear</module>
+                <module>customer-jetty</module>
+                <module>customer-tomcat</module>
+                <module>customer-client</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -105,7 +105,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -17,10 +17,9 @@
     specific language governing permissions and limitations
     under the License.
 -->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-
-    <context-root>/dbtester</context-root>
+    <context-root>${project.artifactId}</context-root>
 
 </web-app>
 

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -105,7 +105,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -18,9 +18,9 @@
     under the License.
 -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-    <context-root>/dbtester</context-root>
+    <context-root>${project.artifactId}</context-root>
 
 </web-app>
 

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/pom.xml Fri Jun 25 06:33:41 2010
@@ -40,19 +40,19 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimoJavaEE5Version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${geronimoJavaEE5Version}</version>
+            <artifactId>geronimo-connector-1_6</artifactId>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-management</artifactId>
-            <version>${geronimoJavaEE5Version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/pom.xml Fri Jun 25 06:33:41 2010
@@ -64,5 +64,14 @@
                 <module>dbtester-war</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>dbtester-war</module>
+                <module>dbtester-jetty</module>
+                <module>dbtester-tomcat</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -112,7 +112,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -20,19 +20,19 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
-
-    <context-root>/inventory</context-root>
+	
+	<context-root>${project.artifactId}</context-root>
 
     <!-- define a reference name to the db pool-->
     <resource-ref>
         <ref-name>jdbc/InventoryDS</ref-name>
         <resource-link>SampleTxDatasource</resource-link>
     </resource-ref>
-    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
-        <attribute name="testSQL">select * from item</attribute>
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+        <!--<attribute name="testSQL">select * from item</attribute>-->
         <attribute name="path">InventoryDB.sql</attribute>
         <reference name="DataSource">
             <name>SampleTxDatasource</name>
         </reference>
     </gbean>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -54,7 +54,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -76,7 +76,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -112,7 +112,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -21,18 +21,18 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-    <context-root>/inventory</context-root>
+    <context-root>${project.artifactId}</context-root>
 
     <!-- define a reference name to the db pool-->
     <resource-ref>
         <ref-name>jdbc/InventoryDS</ref-name>
         <resource-link>SampleTxDatasource</resource-link>
     </resource-ref>
-    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
-        <attribute name="testSQL">select * from item</attribute>
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+        <!--<attribute name="testSQL">select * from item</attribute>-->
         <attribute name="path">InventoryDB.sql</attribute>
         <reference name="DataSource">
             <name>SampleTxDatasource</name>
         </reference>
     </gbean>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/pom.xml Fri Jun 25 06:33:41 2010
@@ -64,5 +64,14 @@
                 <module>inventory-war</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>inventory-war</module>
+                <module>inventory-jetty</module>
+                <module>inventory-tomcat</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -120,7 +120,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -19,9 +19,9 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-    <context-root>/jaxws-calculator</context-root>
+    <context-root>${project.artifactId}</context-root>
 
     <service-ref>
         <service-ref-name>services/Calculator</service-ref-name>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -78,7 +78,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -120,7 +120,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -19,9 +19,9 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-    <context-root>/jaxws-calculator</context-root>
+    <context-root>${project.artifactId}</context-root>
 
     <service-ref>
         <service-ref-name>services/Calculator</service-ref-name>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-war/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-war/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-war/pom.xml Fri Jun 25 06:33:41 2010
@@ -39,12 +39,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -53,8 +53,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/pom.xml Fri Jun 25 06:33:41 2010
@@ -63,5 +63,14 @@
                 <module>jaxws-calculator-war</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>jaxws-calculator-war</module>
+                <module>jaxws-calculator-jetty</module>
+                <module>jaxws-calculator-tomcat</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/META-INF/geronimo-application.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/META-INF/geronimo-application.xml Fri Jun 25 06:33:41 2010
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev: 640490 $ $Date: 2008-03-25 02:12:04 +0800 (Tue, 25 Mar 2008) $ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <moduleId>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>${pom.artifactId}</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </moduleId>
-    </environment>
-    <module>
-       <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
-       <alt-dd>jms-resources.xml</alt-dd>
-    </module>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev: 640490 $ $Date: 2008-03-25 02:12:04 +0800 (Tue, 25 Mar 2008) $ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <moduleId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </moduleId>
+    </environment>
+    <module>
+       <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
+       <alt-dd>jms-resources.xml</alt-dd>
+    </module>
+</application>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/jms-resources.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/jms-resources.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/jms-resources.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/jms-resources.xml Fri Jun 25 06:33:41 2010
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<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>${pom.groupId}</dep:groupId>
-                    <dep:artifactId>jms-resources</dep:artifactId>
-                    <dep:version>${version}</dep:version>
-                    <dep:type>rar</dep:type>
-                </dep:moduleId>
-                <dep:dependencies>
-                    <dep:dependency>
-                        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>activemq-broker</dep:artifactId>
-                        <dep:type>car</dep:type>
-                    </dep:dependency>
-                </dep:dependencies>
-            </dep:environment>
-            <resourceadapter>
-                <resourceadapter-instance>
-                    <resourceadapter-name>jms-resources</resourceadapter-name>
-                    <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
-                        <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
-                    </nam:workmanager>
-                </resourceadapter-instance>
-                <outbound-resourceadapter>
-                    <connection-definition>
-                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                        <connectiondefinition-instance>
-                            <name>OrderConnectionFactory</name>
-                            <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-                            <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-                            <connectionmanager>
-                                <xa-transaction>
-                                    <transaction-caching/>
-                                </xa-transaction>
-                                <single-pool>
-                                    <match-one/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                    </connection-definition>
-                </outbound-resourceadapter>
-            </resourceadapter>
-            <adminobject>
-                <adminobject-interface>javax.jms.Queue</adminobject-interface>
-                <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>OrderQueue</message-destination-name>
-                    <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
-            <adminobject>
-                <adminobject-interface>javax.jms.Topic</adminobject-interface>
-                <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
-            </adminobject>
- </connector>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<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>${pom.groupId}</dep:groupId>
+                    <dep:artifactId>jms-resources</dep:artifactId>
+                    <dep:version>${version}</dep:version>
+                    <dep:type>rar</dep:type>
+                </dep:moduleId>
+                <dep:dependencies>
+                    <dep:dependency>
+                        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+                        <dep:artifactId>activemq-broker</dep:artifactId>
+                        <dep:type>car</dep:type>
+                    </dep:dependency>
+                </dep:dependencies>
+            </dep:environment>
+            <resourceadapter>
+                <resourceadapter-instance>
+                    <resourceadapter-name>jms-resources</resourceadapter-name>
+                    <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
+                        <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
+                    </nam:workmanager>
+                </resourceadapter-instance>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>OrderConnectionFactory</name>
+                            <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+                            <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+                            <connectionmanager>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <single-pool>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+            <adminobject>
+                <adminobject-interface>javax.jms.Queue</adminobject-interface>
+                <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+                <adminobject-instance>
+                    <message-destination-name>OrderQueue</message-destination-name>
+                    <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
+                </adminobject-instance>
+            </adminobject>
+            <adminobject>
+                <adminobject-interface>javax.jms.Topic</adminobject-interface>
+                <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
+            </adminobject>
+ </connector>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Jun 25 06:33:41 2010
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev: 588772 $ $Date: 2007-10-27 04:47:34 +0800 (Sat, 27 Oct 2007) $ -->
-
-<openejb-jar 
-	xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
-	xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1" 
-	xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1" 
-	xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-	<sys:environment>
-		<sys:moduleId>			
-			<sys:groupId>${pom.groupId}</sys:groupId>
-			<sys:artifactId>${pom.artifactId}</sys:artifactId>
-			<sys:version>${version}</sys:version>
-			<sys:type>jar</sys:type>
-		</sys:moduleId>
-		<sys:dependencies>
-		<sys:dependency>
-			<sys:groupId>org.apache.geronimo.configs</sys:groupId>
-			<sys:artifactId>activemq-broker</sys:artifactId>
-			<sys:type>car</sys:type>
-		</sys:dependency>
-		</sys:dependencies>
-		<sys:hidden-classes/>
-		<sys:non-overridable-classes/>
-	</sys:environment>
-	<enterprise-beans>
-		<message-driven>
-			<ejb-name>OrderRecvMDB</ejb-name>
-			<resource-adapter>
-				<resource-link>jms-resources</resource-link>
-			</resource-adapter>
-		</message-driven>
-	</enterprise-beans>
-</openejb-jar>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev: 588772 $ $Date: 2007-10-27 04:47:34 +0800 (Sat, 27 Oct 2007) $ -->
+
+<openejb-jar 
+	xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
+	xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1" 
+	xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1" 
+	xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+	<sys:environment>
+		<sys:moduleId>			
+			<sys:groupId>${pom.groupId}</sys:groupId>
+			<sys:artifactId>${pom.artifactId}</sys:artifactId>
+			<sys:version>${version}</sys:version>
+			<sys:type>jar</sys:type>
+		</sys:moduleId>
+		<sys:dependencies>
+		<sys:dependency>
+			<sys:groupId>org.apache.geronimo.configs</sys:groupId>
+			<sys:artifactId>activemq-broker</sys:artifactId>
+			<sys:type>car</sys:type>
+		</sys:dependency>
+		</sys:dependencies>
+		<sys:hidden-classes/>
+		<sys:non-overridable-classes/>
+	</sys:environment>
+	<enterprise-beans>
+		<message-driven>
+			<ejb-name>OrderRecvMDB</ejb-name>
+			<resource-adapter>
+				<resource-link>jms-resources</resource-link>
+			</resource-adapter>
+		</message-driven>
+	</enterprise-beans>
+</openejb-jar>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -72,7 +72,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -129,7 +129,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -19,11 +19,11 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
 
     <module>
-        <ejb>jms-mdb-ejb-${pom.version}.jar</ejb>
-        <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+        <ejb>jms-mdb-ejb-${project.version}.jar</ejb>
+        <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.2">
             <enterprise-beans>
                 <message-driven>
                     <ejb-name>OrderRecvMDB</ejb-name>
@@ -36,7 +36,7 @@
 
     </module>
     <module>
-        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
+        <connector>activemq-ra-${geronimoVersion}.rar</connector>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
             <resourceadapter>
                 <resourceadapter-instance>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -72,7 +72,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -86,7 +86,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -129,7 +129,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -19,11 +19,11 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
 
     <module>
         <ejb>jms-mdb-ejb-${pom.version}.jar</ejb>
-        <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+        <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.2">
             <enterprise-beans>
                 <message-driven>
                     <ejb-name>OrderRecvMDB</ejb-name>
@@ -36,7 +36,7 @@
 
     </module>
     <module>
-        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
+        <connector>activemq-ra-${geronimoVersion}.rar</connector>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
             <resourceadapter>
                 <resourceadapter-instance>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/pom.xml Fri Jun 25 06:33:41 2010
@@ -43,7 +43,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -81,5 +81,16 @@
                 <module>jms-mdb-ear</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>jms-mdb-ejb</module>
+                <module>jms-mdb-war</module>
+                <module>jms-mdb-ear</module>
+                <module>jms-mdb-jetty</module>
+                <module>jms-mdb-tomcat</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -104,7 +104,6 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <category>Sample</category>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -14,8 +14,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.-->
 <!--$Rev$ $Date$-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-    <context-root>/jsp-examples</context-root>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+    <context-root>${project.artifactId}</context-root>
     <security-realm-name>geronimo-admin</security-realm-name>
     <security>
         <role-mappings>
@@ -24,4 +24,4 @@
             </role>
         </role-mappings>
     </security>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -50,7 +50,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -72,7 +72,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -104,7 +104,6 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <category>Sample</category>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -14,8 +14,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.-->
 <!--$Rev$ $Date$-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-    <context-root>/jsp-examples</context-root>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+    <context-root>${project.artifactId}</context-root>
     <security-realm-name>geronimo-admin</security-realm-name>
     <security>
         <role-mappings>
@@ -24,4 +24,4 @@
             </role>
         </role-mappings>
     </security>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/pom.xml Fri Jun 25 06:33:41 2010
@@ -63,5 +63,16 @@
                 <module>jsp-examples-war</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>jsp-examples-war</module>
+                <module>jsp-examples-jetty</module>
+                <module>jsp-examples-tomcat</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -118,7 +118,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -17,8 +17,8 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
-    <context-root>/LDAP_Sample</context-root>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+    <context-root>${project.artifactId}</context-root>
 
     <security-realm-name>LDAP_Sample_Realm</security-realm-name>
     <security>
@@ -40,4 +40,4 @@
             </role>
         </role-mappings>
     </security>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-realm/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-realm/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-realm/pom.xml Fri Jun 25 06:33:41 2010
@@ -78,7 +78,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -76,7 +76,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -110,7 +110,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -17,8 +17,8 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
-    <context-root>/LDAP_Sample</context-root>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+    <context-root>${project.artifactId}</context-root>
 
     <security-realm-name>LDAP_Sample_Realm</security-realm-name>
     <security>
@@ -40,4 +40,4 @@
             </role>
         </role-mappings>
     </security>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/pom.xml Fri Jun 25 06:33:41 2010
@@ -65,5 +65,15 @@
                 <module>ldap-sample-app-war</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>ldap-sample-app-war</module>
+                <module>ldap-sample-app-realm</module>
+                <module>ldap-sample-app-jetty</module>
+                <module>ldap-sample-app-tomcat</module>
+            </modules>                
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -78,7 +78,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -135,7 +135,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -19,10 +19,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">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
 
-    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
-        <attribute name="testSQL">select * from phonebook</attribute>
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+        <!--<attribute name="testSQL">select * from phonebook</attribute>-->
         <attribute name="path">PhoneBook.sql</attribute>
         <reference name="DataSource">
             <name>SampleTxDatasource</name>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -54,7 +54,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -91,7 +91,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -134,7 +134,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -21,8 +21,8 @@
 <!-- $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 phonebook</attribute>
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+        <!--<attribute name="testSQL">select * from phonebook</attribute>-->
         <attribute name="path">PhoneBook.sql</attribute>
         <reference name="DataSource">
             <name>SampleTxDatasource</name>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/pom.xml Fri Jun 25 06:33:41 2010
@@ -43,13 +43,13 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -82,5 +82,16 @@
                 <module>myphonebook-ear</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>myphonebook-ejb</module>
+                <module>myphonebook-war</module>
+                <module>myphonebook-ear</module>
+                <module>myphonebook-jetty</module>
+                <module>myphonebook-tomcat</module>
+            </modules>            
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -72,7 +72,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -128,7 +128,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -19,6 +19,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">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
 
 </application>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -72,7 +72,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -85,7 +85,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -128,7 +128,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -19,6 +19,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">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
 
 </application>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/pom.xml Fri Jun 25 06:33:41 2010
@@ -68,5 +68,16 @@
                 <module>mytime-ear</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>mytime-ejb</module>
+                <module>mytime-war</module>
+                <module>mytime-ear</module>
+                <module>mytime-jetty</module>
+                <module>mytime-tomcat</module>
+            </modules>         
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml Fri Jun 25 06:33:41 2010
@@ -31,93 +31,26 @@
     <packaging>pom</packaging>
     <description>
         Geronimo Samples - Java EE 5
-    </description>
-
-    <properties>
-        <geronimoJavaEE5Version>2.2</geronimoJavaEE5Version>
-        <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
-        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
-        <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
-        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
-        <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
-        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
-        <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
-        <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
-
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Import Geronimo Server used dependency versions -->
-            <dependency>
-                <groupId>org.apache.geronimo</groupId>
-                <artifactId>geronimo</artifactId>
-                <version>${geronimoJavaEE5Version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!-- Import ActiveMQ dependency versions -->
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>activemq</artifactId>
-                <version>${geronimoJavaEE5Version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!-- Java EE 5 specs 
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_1.0_spec</artifactId>
-                <version>1.1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jsp_2.1_spec</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.2</version>
-            </dependency>-->
-            <!-- Java EE 5 specs -->
-            <!--<dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                <version>1.1.1</version>
-            </dependency>-->
-        </dependencies>
-    </dependencyManagement>
+    </description>      
 
     <dependencies>
-        <!-- Java EE 5 specs common for all samples -->
+        <!-- Common used Java EE 6 specs -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                <scope>provided</scope>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <scope>provided</scope>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
-        <!-- Java EE 5 specs common for all samples -->
+        <!-- Common used Java EE 6 specs -->
     </dependencies>
 
     <build>        
@@ -159,26 +92,25 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <modules>
-                <module>sample-datasource</module>
-                <module>customer</module>
+            <modules>                
+                <!--<module>customer</module>-->
                 <!--<module>async-http</module>-->
-                <module>bank</module>
-                <module>calculator</module>
+                <!--<module>bank</module>-->
+                <!--<module>calculator</module>-->
                 <module>dbtester</module>
                 <module>inventory</module>
-                <module>jaxws-calculator</module>
-                <module>jms-mdb</module>
+                <!--<module>jaxws-calculator</module>-->
+                <!--<module>jms-mdb</module>-->
                 <module>ldap-sample-app</module>
-                <module>myphonebook</module>
-                <module>mytime</module>
+                <!--<module>myphonebook</module>-->
+                <!--<module>mytime</module>-->
                 <module>sendmail</module>
                 <module>timereport</module>
                 <module>jsp-examples</module>
                 <module>servlet-examples</module>
                 <module>app-per-port</module>
-	            <module>csa-activemq</module>
-                <module>DataCDInfo</module>
+	            <!--<module>csa-activemq</module>-->
+                <!--<module>DataCDInfo</module>-->
             </modules>
         </profile>
         <profile>
@@ -210,5 +142,29 @@
                 <module>DataCDInfo</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>customer</module>
+                <module>async-http</module>
+                <module>bank</module>
+                <module>calculator</module>
+                <module>dbtester</module>
+                <module>inventory</module>
+                <module>jaxws-calculator</module>
+                <module>jms-mdb</module>
+                <module>ldap-sample-app</module>
+                <module>myphonebook</module>
+                <module>mytime</module>
+                <module>sendmail</module>
+                <module>timereport</module>
+                <module>jsp-examples</module>
+                <module>servlet-examples</module>
+                <module>app-per-port</module>
+	            <module>csa-activemq</module>
+                <module>DataCDInfo</module>
+            </modules>
+        </profile>
     </profiles>    
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/pom.xml Fri Jun 25 06:33:41 2010
@@ -64,5 +64,16 @@
                 <module>sendmail-war</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>sendmail-war</module>
+                <module>sendmail-jetty</module>
+                <module>sendmail-tomcat</module>
+            </modules>       
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -111,7 +111,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -20,7 +20,7 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
-    <context-root>/sendmail</context-root>
+    <context-root>${project.artifactId}</context-root>
     <resource-ref>
         <!-- Used is web.xml -->
         <ref-name>mail/testMailSession</ref-name>