Return-Path: 
 <scm-return-40896-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 92832 invoked from network); 17 Mar 2010 10:23:55 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 17 Mar 2010 10:23:55 -0000
Received: (qmail 74052 invoked by uid 500); 17 Mar 2010 10:23:55 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 73922 invoked by uid 500); 17 Mar 2010 10:23:55 -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 73915 invoked by uid 99); 17 Mar 2010 10:23:54 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Mar 2010 10:23:54 +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; Wed, 17 Mar 2010 10:23:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8F1E2238898B; Wed, 17 Mar 2010 10:23:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r924206 - in /geronimo/server/branches/2.1: ./
 plugins/jasper/jasper/
 plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/
 plugins/tomcat/geronimo-tomcat6/ plugins/tomcat/tomcat6/
Date: Wed, 17 Mar 2010 10:23:30 -0000
To: scm@geronimo.apache.org
From: xuhaihong@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100317102330.8F1E2238898B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: xuhaihong
Date: Wed Mar 17 10:23:30 2010
New Revision: 924206

URL: http://svn.apache.org/viewvc?rev=924206&view=rev
Log:
Update Tomcat version number and remove duplicate juli dependency

Modified:
    geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml
    geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml?rev=924206&r1=924205&r2=924206&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml Wed Mar 17 10:23:30 2010
@@ -84,7 +84,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat.extras</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>juli</artifactId>
         </dependency>
 

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java?rev=924206&r1=924205&r2=924206&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java Wed Mar 17 10:23:30 2010
@@ -149,6 +149,8 @@ public class ClusteredManagerTest extend
     
     public void testInvalidateSessionReleasesUnderlyingSessionAndRemoveSessionFromManager() throws Exception {
         final org.apache.geronimo.clustering.Session underlyingSession =recordCreateUnderlyingSession();
+        context.getLoader();
+        modify().returnValue(null);
         underlyingSession.release();
         modify().perform(new Action() {
             public Object invocation(Object[] arg0, MethodHandle arg1) throws Throwable {

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=924206&r1=924205&r2=924206&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml Wed Mar 17 10:23:30 2010
@@ -77,7 +77,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat.extras</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>juli</artifactId>
         </dependency>
 

Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml?rev=924206&r1=924205&r2=924206&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml Wed Mar 17 10:23:30 2010
@@ -99,7 +99,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat.extras</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>juli</artifactId>
         </dependency>
 

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=924206&r1=924205&r2=924206&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Wed Mar 17 10:23:30 2010
@@ -61,6 +61,16 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
+        <!--
+        NOTE: Project version, to be used instead of ${pom.version} since that
+              value magically changes when using SNAPSHOT versions.
+
+              This value *must* be kept in sync with the value of the <version>
+              element, and it will need to be changed manually before a release,
+              as the maven-release-plugin will not update this value.
+        -->
+        <version>2.1.5-SNAPSHOT</version>
+        
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${version}</geronimoVersion>
 
@@ -71,8 +81,8 @@
         -->
         <openejbVersion>3.0.2-SNAPSHOT</openejbVersion>
         <derbyVersion>10.5.3.0_1</derbyVersion>
-        <externalTomcatVersion>6.0.20.0</externalTomcatVersion>
-        <tomcatVersion>6.0.20</tomcatVersion>
+        <externalTomcatVersion>6.0.26.1-SNAPSHOT</externalTomcatVersion>
+        <tomcatVersion>6.0.26</tomcatVersion>
         <eclipseVersion>3.3.0-v_771</eclipseVersion>
         <dojoVersion>1.0.2</dojoVersion>
         <dojoLegacyVersion>0.4.3</dojoLegacyVersion>
@@ -1230,12 +1240,6 @@
 
             <dependency>
                 <groupId>org.apache.tomcat.extras</groupId>
-                <artifactId>juli</artifactId>
-                <version>${tomcatVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.tomcat.extras</groupId>
                 <artifactId>juli-adapters</artifactId>
                 <version>${tomcatVersion}</version>
             </dependency>