commit 6dbd6b49c66939b58ed1df3fdf264f4adac17f16
author Ate Douma <ate@apache.org> Sat Sep 17 19:35:04 2011 +0000
committer Ate Douma <ate@apache.org> Sat Sep 17 19:35:04 2011 +0000
tree 79c89690d5d031826ba9fe16943a1d5461208596
parent 06d52dbd9e971a149f9a24e18a4d21544945193c

PLUTO-611: Upgrade binary distribution to use latest Tomcat 7.0.21
See: http://issues.apache.org/jira/browse/PLUTO-611

git-svn-id: https://svn.apache.org/repos/asf/portals/pluto/trunk@1172055 13f79535-47bb-0310-9956-ffa450edef68

dist-build.xml

diff --git a/dist-build.xml b/dist-build.xml
index 6e1ec87..3d22599 100644
--- a/dist-build.xml
+++ b/dist-build.xml
@@ -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"
 		/>