Return-Path: 
 <scm-return-43357-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 6796 invoked from network); 25 Jun 2010 06:35:20 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 25 Jun 2010 06:35:20 -0000
Received: (qmail 28882 invoked by uid 500); 25 Jun 2010 06:35:20 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 28751 invoked by uid 500); 25 Jun 2010 06:35:19 -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 28735 invoked by uid 99); 25 Jun 2010 06:35:19 -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:19 +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:11 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 92EA82388C1C; 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 [12/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.92EA82388C1C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -62,27 +62,12 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa20-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -104,7 +89,6 @@
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -24,18 +24,6 @@
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
          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>car</sys:type>
-    </sys:moduleId>
-    <sys:dependencies/>
-    <sys:hidden-classes/>
-    <sys:non-overridable-classes/>
-  </sys:environment>
-
-  <context-root>/${pom.artifactId}</context-root>
+  <context-root>/${project.artifactId}</context-root>
 
 </web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/pom.xml Fri Jun 25 06:33:41 2010
@@ -57,8 +57,9 @@
                 <module>fragment2</module>
                 <module>fragment3</module>
                 <module>webfragment-javaee6-war</module>	            
-                <module>webfragment-javaee6-tomcat</module>       
-                <module>webfragment-javaee6-jetty</module>      
+                <!-- Plugin cannot be made caused by GERONIMO-5398 -->
+                <!-- <module>webfragment-javaee6-tomcat</module>       
+                <module>webfragment-javaee6-jetty</module>-->
             </modules>
         </profile>
         <profile>
@@ -77,5 +78,17 @@
                 <module>webfragment-javaee6-war</module>                
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+ 
+             <modules>
+		        <module>fragment1</module>
+                <module>fragment2</module>
+                <module>fragment3</module>
+                <module>webfragment-javaee6-war</module>                
+                <module>webfragment-javaee6-tomcat</module>       
+                <module>webfragment-javaee6-jetty</module>
+            </modules>
+        </profile>
     </profiles>   
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>webfragment-javaee6-war</artifactId>
-            <version>3.0-M1-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
 
@@ -58,31 +58,7 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa20-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
+        </dependency>       
     </dependencies>
 
     <build>
@@ -102,14 +78,12 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>                        
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
                         <artifactId>webfragment-javaee6-war</artifactId>
-                        <version>3.0-M1-SNAPSHOT</version>
+                        <version>${version}</version>
                         <type>war</type>
                     </module>
                     <useMavenDependencies>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -23,19 +23,7 @@
          xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
          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>car</sys:type>
-    </sys:moduleId>
-    <sys:dependencies/>
-    <sys:hidden-classes/>
-    <sys:non-overridable-classes/>
-  </sys:environment>
-
-  <context-root>/${pom.artifactId}</context-root>
+  
+  <context-root>/${project.artifactId}</context-root>
 
 </web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -58,31 +58,7 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa20-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
+        </dependency>        
     </dependencies>
 
     <build>
@@ -102,9 +78,7 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>                        
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -23,19 +23,7 @@
          xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
          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>car</sys:type>
-    </sys:moduleId>
-    <sys:dependencies/>
-    <sys:hidden-classes/>
-    <sys:non-overridable-classes/>
-  </sys:environment>
-
-  <context-root>/${pom.artifactId}</context-root>
+  
+  <context-root>/${project.artifactId}</context-root>
 
 </web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun 25 06:33:41 2010
@@ -25,8 +25,8 @@ under the License.
 
   <sys:environment>
     <sys:moduleId>
-      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
-      <sys:artifactId>webfragment-javaee6</sys:artifactId>
+      <sys:groupId>${project.groupId}</sys:groupId>
+      <sys:artifactId>${project.artifactId}</sys:artifactId>
       <sys:version>${version}</sys:version>
       <sys:type>car</sys:type>
     </sys:moduleId>
@@ -35,6 +35,6 @@ under the License.
     <sys:non-overridable-classes/>
   </sys:environment>
 
-  <context-root>/webfragment-javaee6</context-root>
+  <context-root>${project.artifactId}</context-root>
 
 </web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/pom.xml Fri Jun 25 06:33:41 2010
@@ -28,7 +28,25 @@
     <packaging>pom</packaging>
     <description>
         Geronimo Samples.
-    </description>   
+    </description>    
+
+    <properties>
+        <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-1_6/${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/${tomcat}-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-jpa20-deployer/${geronimoVersion}/car</jpaDeployer>
+        <myfacesDeployer>org.apache.geronimo.configs/myfaces-deployer/${geronimoVersion}/car</myfacesDeployer>
+    </properties>
 
     <build>
         <resources>
@@ -143,11 +161,12 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
+                <module>sample-datasource</module>
                 <module>javaee5</module>
                 <module>javaee6</module>
                 <module>osgi</module>
                 <module>daytrader</module>
-                <module>all-samples</module>
+                <module>all-samples</module>                
             </modules>
         </profile>
         <profile>
@@ -166,5 +185,17 @@
                 <module>daytrader</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>sample-datasource</module>
+                <module>javaee5</module>
+                <module>javaee6</module>
+                <module>osgi</module>
+                <module>daytrader</module>
+                <module>all-samples</module>                
+            </modules>
+        </profile>
     </profiles>  
 </project>

Added: geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml?rev=957816&view=auto
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml (added)
+++ geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml Fri Jun 25 06:33:41 2010
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>samples</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>sample-datasource</artifactId>
+    <name>Geronimo Plugins, Sample Datasource :: Shared Sample Datasource</name>
+    <packaging>car</packaging>
+
+    <description>
+        Shared Sample datasource plugin for all geronimo samples
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer-1_6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-1_6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-derby</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-jdbc</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <version>1.6</version>
+            <type>rar</type>
+            <!--<scope>provided</scope>-->
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                        <type>rar</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>                    
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/dependencies.xml?rev=957816&view=auto
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/dependencies.xml (added)
+++ geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/dependencies.xml Fri Jun 25 06:33:41 2010
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>sample-database</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>transaction-1_6</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-jdbc</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-derby</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+        <type>rar</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/plan.xml?rev=957816&view=auto
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/plan.xml (added)
+++ geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -0,0 +1,63 @@
+<?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$ $Date$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+
+    <resourceadapter>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>SampleTxDatasource</name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>SampleNoTxDatasource</name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>    
+
+</connector>

Propchange: geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml