Return-Path: 
 <scm-return-5744-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 83371 invoked from network); 29 Nov 2004 22:55:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 29 Nov 2004 22:55:55 -0000
Received: (qmail 31277 invoked by uid 500); 29 Nov 2004 22:55:53 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 31259 invoked by uid 500); 29 Nov 2004 22:55:53 -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
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 31245 invoked by uid 99); 29 Nov 2004 22:55:53 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 29 Nov 2004 14:55:53 -0800
Received: (qmail 83363 invoked by uid 65534); 29 Nov 2004 22:55:52 -0000
Date: 29 Nov 2004 22:55:52 -0000
Message-ID: <20041129225552.83358.qmail@minotaur.apache.org>
From: chirino@apache.org
To: scm@geronimo.apache.org
Subject: svn commit: r106970 - /geronimo/trunk/etc/version-info.ent
 /geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: chirino
Date: Mon Nov 29 14:55:51 2004
New Revision: 106970

URL: http://svn.apache.org/viewcvs?view=rev&rev=106970
Log:
Changed ActiveMQ version to 1.3-SNAPSHOT


Modified:
   geronimo/trunk/etc/version-info.ent
   geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml

Modified: geronimo/trunk/etc/version-info.ent
Url: http://svn.apache.org/viewcvs/geronimo/trunk/etc/version-info.ent?view=diff&rev=106970&p1=geronimo/trunk/etc/version-info.ent&r1=106969&p2=geronimo/trunk/etc/version-info.ent&r2=106970
==============================================================================
--- geronimo/trunk/etc/version-info.ent	(original)
+++ geronimo/trunk/etc/version-info.ent	Mon Nov 29 14:55:51 2004
@@ -3,7 +3,7 @@
 <!ENTITY geronimo-system-version "1.0-SNAPSHOT">
 
 <!--actual dependencies-->
-<!ENTITY activemq-version "1.2-SNAPSHOT">
+<!ENTITY activemq-version "1.3-SNAPSHOT">
 <!ENTITY geronimo-version "1.0-SNAPSHOT">
 <!ENTITY openejb-version "2.0-SNAPSHOT">
 <!ENTITY tranql-version "1.0-SNAPSHOT">

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?view=diff&rev=106970&p1=geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r1=106969&p2=geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r2=106970
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml	Mon Nov 29 14:55:51 2004
@@ -180,7 +180,7 @@
     </gbean>
 
     <gbean name="geronimo.server:type=TransactionManager" class="org.apache.geronimo.transaction.GeronimoTransactionManager">
-        <attribute name="defaultTransactionTimeoutSeconds" type="int">10</attribute>
+        <attribute name="defaultTransactionTimeoutSeconds" type="int">300</attribute>
         <reference name="TransactionLog">geronimo.server:type=HOWLTransactionLog</reference>
         <references name="ResourceManagers">
             <pattern>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</pattern>