Return-Path: 
 <pluto-scm-return-2128-apmail-portals-pluto-scm-archive=portals.apache.org@portals.apache.org>
X-Original-To: apmail-portals-pluto-scm-archive@www.apache.org
Delivered-To: apmail-portals-pluto-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 58BAD8A40
	for <apmail-portals-pluto-scm-archive@www.apache.org>;
 Sat, 17 Sep 2011 19:35:26 +0000 (UTC)
Received: (qmail 61206 invoked by uid 500); 17 Sep 2011 19:35:26 -0000
Delivered-To: apmail-portals-pluto-scm-archive@portals.apache.org
Received: (qmail 61174 invoked by uid 500); 17 Sep 2011 19:35:26 -0000
Mailing-List: contact pluto-scm-help@portals.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:pluto-scm-help@portals.apache.org>
list-unsubscribe: <mailto:pluto-scm-unsubscribe@portals.apache.org>
List-Post: <mailto:pluto-scm@portals.apache.org>
List-Id: <pluto-scm.portals.apache.org>
Delivered-To: mailing list pluto-scm@portals.apache.org
Received: (qmail 61167 invoked by uid 99); 17 Sep 2011 19:35:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Sep 2011 19:35:26 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sat, 17 Sep 2011 19:35:25 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E1C2923888FD;
	Sat, 17 Sep 2011 19:35:04 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1172055 - /portals/pluto/trunk/dist-build.xml
Date: Sat, 17 Sep 2011 19:35:04 -0000
To: pluto-scm@portals.apache.org
From: ate@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20110917193504.E1C2923888FD@eris.apache.org>

Author: ate
Date: Sat Sep 17 19:35:04 2011
New Revision: 1172055

URL: http://svn.apache.org/viewvc?rev=1172055&view=rev
Log:
PLUTO-611: Upgrade binary distribution to use latest Tomcat 7.0.21
See: http://issues.apache.org/jira/browse/PLUTO-611

Modified:
    portals/pluto/trunk/dist-build.xml

Modified: portals/pluto/trunk/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?rev=1172055&r1=1172054&r2=1172055&view=diff
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Sat Sep 17 19:35:04 2011
@@ -44,8 +44,8 @@
 -->
 <project name="PlutoDistributions" default="bundle-dist">
 
-    <property name="tomcat.major.version" value="6" description="Major version of Tomcat to deploy Pluto war files."/>
-    <property name="tomcat.full.version" value="6.0.26" description="Full version of Tomcat to deploy Pluto war files."/>
+    <property name="tomcat.major.version" value="7" description="Major version of Tomcat to deploy Pluto war files."/>
+    <property name="tomcat.full.version" value="7.0.21" description="Full version of Tomcat to deploy Pluto war files."/>
 
     <xmlproperty file="pom.xml"/> <!-- picks up pluto build version from pom file -->
     <property name="pluto.version" value="${project.version}" description="Version of Pluto to build"/>
@@ -125,10 +125,11 @@
             </fileset>
         </copy>
 
-         <!-- Add emptySessionPath="true" to Connector element in server.xml -->
-		<replace file="${dist.dir}/conf/server.xml"
-			token="redirectPort=&quot;8443&quot; /&gt;" 
-			value="redirectPort=&quot;8443&quot; emptySessionPath=&quot;true&quot; /&gt;" 
+         <!-- Add sessionCookiePath="/" to root Context in context.xml
+             (Tomcat 6.0.27+ replacement for emptySessionPath="true" attribute of Connector element in server.xml) -->
+		<replace file="${dist.dir}/conf/context.xml"
+			token="&lt;Context&gt;" 
+			value="&lt;Context sessionCookiePath=&quot;/&quot;&gt;" 
 			summary="true"
 		/>