Return-Path: 
 <scm-return-37376-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 46227 invoked from network); 3 Jul 2009 01:40:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 3 Jul 2009 01:40:07 -0000
Received: (qmail 85327 invoked by uid 500); 3 Jul 2009 01:40:17 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 85259 invoked by uid 500); 3 Jul 2009 01:40:17 -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 85250 invoked by uid 99); 3 Jul 2009 01:40:17 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jul 2009 01:40:17 +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, 03 Jul 2009 01:40:14 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id AE5BC23888C5; Fri,  3 Jul 2009 01:39:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r790775 - in /geronimo/server/trunk:
 plugins/activemq/activemq-broker/src/main/resources/activemq.xml pom.xml
Date: Fri, 03 Jul 2009 01:39:53 -0000
To: scm@geronimo.apache.org
From: kevan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090703013953.AE5BC23888C5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kevan
Date: Fri Jul  3 01:39:53 2009
New Revision: 790775

URL: http://svn.apache.org/viewvc?rev=790775&view=rev
Log:
GERONIMO-4685 Update to new Tomcat version

Modified:
    geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml?rev=790775&r1=790774&r2=790775&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml Fri Jul  3 01:39:53 2009
@@ -37,7 +37,7 @@
          </property>
     </bean>
 
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}" tmpDataDirectory="${activemq.data}/tmp_storage">
+    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}" tmpDataDirectory="${activemq.data}/tmp_storage" useShutdownHook="false">
 
         <!--
             Configure per-destination policies on the broker. The policies

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=790775&r1=790774&r2=790775&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Jul  3 01:39:53 2009
@@ -73,7 +73,7 @@
         FIXME: STOP using properties for dependency versions unless you absolutly need them,
                ie. you have a hundred dependencies that all use the same version.
         -->
-        <tomcatVersion>6.0.18-SNAPSHOT</tomcatVersion>
+        <tomcatVersion>6.0.20-SNAPSHOT</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
         <openejbVersion>3.1.2-SNAPSHOT</openejbVersion>