Return-Path: 
 <scm-return-16289-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 23109 invoked from network); 4 Dec 2006 18:07:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Dec 2006 18:07:44 -0000
Received: (qmail 9842 invoked by uid 500); 4 Dec 2006 18:07:53 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 9705 invoked by uid 500); 4 Dec 2006 18:07:52 -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 9694 invoked by uid 99); 4 Dec 2006 18:07:52 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 10:07:52 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 10:07:43 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8E25F1A9846; Mon,  4 Dec 2006 10:07:02 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r482269 - in /geronimo/server/trunk/assemblies:
 geronimo-jetty-j2ee/src/main/var/config/
 geronimo-jetty-minimal/src/main/var/config/
 geronimo-tomcat-j2ee/src/main/var/config/
 geronimo-tomcat-minimal/src/main/var/config/
Date: Mon, 04 Dec 2006 18:07:02 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061204180702.8E25F1A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Mon Dec  4 10:07:01 2006
New Revision: 482269

URL: http://svn.apache.org/viewvc?view=rev&rev=482269
Log:
GERONIMO-2616 change tx config is config.xmls also, all servers should start now

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?view=diff&rev=482269&r1=482268&r2=482269
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Mon Dec  4 10:07:01 2006
@@ -42,7 +42,7 @@
 
     <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml?view=diff&rev=482269&r1=482268&r2=482269
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml Mon Dec  4 10:07:01 2006
@@ -24,7 +24,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?view=diff&rev=482269&r1=482268&r2=482269
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Mon Dec  4 10:07:01 2006
@@ -24,7 +24,7 @@
 
     <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml?view=diff&rev=482269&r1=482268&r2=482269
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml Mon Dec  4 10:07:01 2006
@@ -24,7 +24,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">